diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:58:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 01:28:04 +0100 |
| commit | ee9d53e5726250295cfe0b9e67518fdd1475390e (patch) | |
| tree | 49c8d062310d87707522dee0db6efdc3d084fce3 /libavcodec/mpeg4video.h | |
| parent | 2d2b363c652403ac0bda129912e1910aacdaa3fc (diff) | |
| parent | 48e139409556861c9e561ce34133891d8eecc3cf (diff) | |
| download | ffmpeg-ee9d53e5726250295cfe0b9e67518fdd1475390e.tar.gz | |
Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'
* commit '48e139409556861c9e561ce34133891d8eecc3cf':
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index d06f54cd8a..c3362e418f 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -68,6 +68,8 @@ typedef struct Mpeg4DecContext { int vol_sprite_usage; // reversible vlc int rvlc; + ///< could this stream contain resync markers + int resync_marker; } Mpeg4DecContext; /* dc encoding for mpeg4 */ |