diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:52:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:52:09 +0100 |
| commit | b4ef7447eb16fc947110d86ebb4593066e524ae1 (patch) | |
| tree | 477d6750fbd35ab75429072df898a9a3227346e9 /libavcodec/mpeg4video.h | |
| parent | ec5499d8bac82007bfc966fb1a7b8233375723cf (diff) | |
| parent | 43af264de8606668c6b2fa7f96c946bdc3dbe072 (diff) | |
Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'
* commit '43af264de8606668c6b2fa7f96c946bdc3dbe072':
mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 1230baa178..1c72abe723 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -70,6 +70,12 @@ typedef struct Mpeg4DecContext { int rvlc; ///< could this stream contain resync markers int resync_marker; + + /* bug workarounds */ + int divx_version; + int divx_build; + int xvid_build; + int lavc_build; } Mpeg4DecContext; /* dc encoding for mpeg4 */ |