diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
| commit | 491f443e1f7ebcc8bf8be434ad7c383f5647aff9 (patch) | |
| tree | 1f4fc3ab2abfd74338d98611ff82f1f330570f89 /libavcodec/utils.c | |
| parent | f326501a65ad1b949f9e623e1665c81e8ce628f8 (diff) | |
| download | ffmpeg-491f443e1f7ebcc8bf8be434ad7c383f5647aff9.tar.gz | |
lavc: remove disabled FF_API_ER cruft.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 6236f79831..7c0f18aa34 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -716,16 +716,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD goto free_and_end; } avctx->frame_number = 0; -#if FF_API_ER - - av_log(avctx, AV_LOG_DEBUG, "err{or,}_recognition separate: %d; %d\n", - avctx->error_recognition, avctx->err_recognition); - /* FF_ER_CAREFUL (==1) implies AV_EF_CRCCHECK (== 1<<1 - 1), - FF_ER_COMPLIANT (==2) implies AV_EF_{CRCCHECK,BITSTREAM} (== 1<<2 - 1), et cetera} */ - avctx->err_recognition |= (1<<(avctx->error_recognition-(avctx->error_recognition>=FF_ER_VERY_AGGRESSIVE))) - 1; - av_log(avctx, AV_LOG_DEBUG, "err{or,}_recognition combined: %d; %d\n", - avctx->error_recognition, avctx->err_recognition); -#endif if (HAVE_THREADS && !avctx->thread_opaque) { ret = ff_thread_init(avctx); |