Mercurial > mplayer.hg
annotate libmpcodecs/vd_internal.h @ 33168:0ee0e309677b
Fix wrong allocation.
Pointer is being freed with av_freep, so make the code consistent by using
av_mallocz. This fix assertion failures with systems having the align memory
hack in FFmpeg.
Patch by Lucius Windschuh, lwindschuh googlemail com.
author | cboesch |
---|---|
date | Thu, 14 Apr 2011 05:57:38 +0000 |
parents | 4be58d992308 |
children |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26029
diff
changeset
|
18 |
26029 | 19 #ifndef MPLAYER_VD_INTERNAL_H |
20 #define MPLAYER_VD_INTERNAL_H | |
4986 | 21 |
22 #include "codec-cfg.h" | |
5607 | 23 #include "img_format.h" |
4986 | 24 |
22599
4faee1254928
Add explicit location for headers from the stream/ directory.
diego
parents:
5607
diff
changeset
|
25 #include "stream/stream.h" |
22601
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22599
diff
changeset
|
26 #include "libmpdemux/demuxer.h" |
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22599
diff
changeset
|
27 #include "libmpdemux/stheader.h" |
4986 | 28 |
29 #include "vd.h" | |
4878 | 30 |
31 // prototypes: | |
4966 | 32 //static vd_info_t info; |
4878 | 33 static int control(sh_video_t *sh,int cmd,void* arg,...); |
34 static int init(sh_video_t *sh); | |
35 static void uninit(sh_video_t *sh); | |
36 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags); | |
37 | |
30519 | 38 #define LIBVD_EXTERN(x) const vd_functions_t mpcodecs_vd_##x = {\ |
4878 | 39 &info,\ |
40 init,\ | |
41 uninit,\ | |
42 control,\ | |
43 decode\ | |
44 }; | |
45 | |
26029 | 46 #endif /* MPLAYER_VD_INTERNAL_H */ |