diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:27:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:27:28 +0100 |
| commit | be0b869b04c049ea00fd178bb4c4fe4b767ed31d (patch) | |
| tree | 2f0ae8973b9cc3a5a1fbec3a47828570e83b7d67 /libavcodec/mpeg4video.h | |
| parent | f924d6e40b269158ff54f5b5a6f08ae3fdefbd5c (diff) | |
| parent | 35e0833d410e31d9fd35695ad798c5d13de2af58 (diff) | |
| download | ffmpeg-streaming-be0b869b04c049ea00fd178bb4c4fe4b767ed31d.zip ffmpeg-streaming-be0b869b04c049ea00fd178bb4c4fe4b767ed31d.tar.gz | |
Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'
* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
mpeg4videodec: add a mpeg4-specific private context.
Conflicts:
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 24e2588..1f064c8 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -59,6 +59,10 @@ #define VISUAL_OBJ_STARTCODE 0x1B5 #define VOP_STARTCODE 0x1B6 +typedef struct Mpeg4DecContext { + MpegEncContext m; +} Mpeg4DecContext; + /* dc encoding for mpeg4 */ extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; |
