generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

Browse Source 
* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
  lavc: deprecate unused mb_threshold field

Conflicts:
	libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-18 15:42:29 +02:00
parent 8be1120deb c4f7bee087
commit 1a5871d1be
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo_enc.c
View File

@@ -640,13 +640,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
return -1;
}
i = (INT_MAX / 2 + 128) >> 8;
if (avctx->mb_threshold >= i) {
av_log(avctx, AV_LOG_ERROR, "mb_threshold too large, max is %d\n",
i - 1);
return -1;
}
if (avctx->b_frame_strategy && (avctx->flags & CODEC_FLAG_PASS2)) {
av_log(avctx, AV_LOG_INFO,
"notice: b_frame_strategy only affects the first pass\n");