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 /ffmpeg.c | |
parent | 6262763d8d6457dc9df09331ba24a4219cf56849 (diff) | |
parent | ccc71298456d97f64f539e303c771d04dcb33c53 (diff) | |
download | ffmpeg-c6c03dfdf1692137111fe4aea0b72a1cff08f71e.tar.gz |
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 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -2502,9 +2502,6 @@ static int transcode_init(void) av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low." " It takes bits/s as argument, not kbits/s\n"); extra_size += ost->st->codec->extradata_size; - - if (ost->st->codec->me_threshold) - input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV; } else { av_opt_set_dict(ost->st->codec, &ost->opts); } |