diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 21:26:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 21:26:59 +0200 |
| commit | 58eaa95116d914c8de303893ddf9fa9b11803b3f (patch) | |
| tree | 758f6ccd54c101493f24a738457ea3ffec54344e /libavcodec/mpeg4video.h | |
| parent | 92de4450347cbee96e64de341ac6fa733ea13cd1 (diff) | |
| parent | ccbf370f2000b9b27f4af259c23007d67f7ea46e (diff) | |
Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'
* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
mpegvideo: move vol_control_parameters to the only place it is used
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 5320b0b66f..08b4cb5432 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -96,6 +96,8 @@ typedef struct Mpeg4DecContext { /// flag for having shown the warning about divxs invalid b frames int showed_packed_warning; + int vol_control_parameters; /**< does the stream contain the low_delay flag, + * used to work around buggy encoders. */ int cplx_estimation_trash_i; int cplx_estimation_trash_p; |