diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:13:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:22:42 +0100 |
| commit | c6c03dfdf1692137111fe4aea0b72a1cff08f71e (patch) | |
| tree | 4306c6e2a64f4db61e50ff729f6c21c0b8f56b07 /libavcodec/mpegvideo.c | |
| parent | 6262763d8d6457dc9df09331ba24a4219cf56849 (diff) | |
| parent | ccc71298456d97f64f539e303c771d04dcb33c53 (diff) | |
Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'
* commit 'ccc71298456d97f64f539e303c771d04dcb33c53':
lavc: deprecate FF_DEBUG_MV and remove all traces of its use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 32d6fa71f8..2a5929d490 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -327,8 +327,7 @@ static int alloc_picture_tables(MpegEncContext *s, Picture *pic) return AVERROR(ENOMEM); } - if (s->out_format == FMT_H263 || s->encoding || - (s->avctx->debug & FF_DEBUG_MV) || s->avctx->debug_mv) { + if (s->out_format == FMT_H263 || s->encoding || s->avctx->debug_mv) { int mv_size = 2 * (b8_array_size + 4) * sizeof(int16_t); int ref_index_size = 4 * mb_array_size; |