diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:45:25 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:46:51 +0400 |
commit | cf948200bd7083fb214bf7e1bd9ce3c82edd3303 (patch) | |
tree | db6dca355dee94aace3fc88106314260ec88534d /libavcodec/mpegvideo.h | |
parent | 36e2ec40688d0c3c350d31fae00a54f6a23b7647 (diff) | |
parent | ff7ffe48097f32417781fe8b2b417eff05a52c55 (diff) |
Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'
* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55':
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index a934a6d0a5..14f0a09cd8 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -568,7 +568,6 @@ typedef struct MpegEncContext { /* H.263 specific */ int gob_index; int obmc; ///< overlapped block motion compensation - int showed_packed_warning; ///< flag for having shown the warning about divxs invalid b frames int mb_info; ///< interval for outputting info about mb offsets as side data int prev_mb_info, last_mb_info; uint8_t *mb_info_ptr; |