diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:21:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:23:43 +0100 |
| commit | ae4e7f7ba603a1624d4aaeee2c368677739b7322 (patch) | |
| tree | 29ea5c72f1e2be65b88f16a5974d7e50851cb594 /libavcodec/mpeg4video.h | |
| parent | b27ba2e540b873fe8e50280a734194ada002a077 (diff) | |
| parent | 58c120a9290eef057dbf26761a4f89b7f67bbde1 (diff) | |
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 15fe68fc2c..d8751f7615 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -75,6 +75,7 @@ typedef struct Mpeg4DecContext { int new_pred; int enhancement_type; + int scalability; /* bug workarounds */ int divx_version; |