diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 21:19:35 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 21:19:35 +0000 |
| commit | 653dc10d5b6a0e7852a228e4b124e2b1a82b1d6c (patch) | |
| tree | d7f7645ad90e27c95455451459fd08b4fa9a3b53 /media | |
| parent | 6600f2ac013fa7e4ab610a16d76407092e1fb9b1 (diff) | |
| download | chromium_src-653dc10d5b6a0e7852a228e4b124e2b1a82b1d6c.zip chromium_src-653dc10d5b6a0e7852a228e4b124e2b1a82b1d6c.tar.gz chromium_src-653dc10d5b6a0e7852a228e4b124e2b1a82b1d6c.tar.bz2 | |
Remove use of AV_EF_CAREFUL from media code.
It's only used in AC3 and ALS decoders, neither of which we use.
Review URL: https://chromiumcodereview.appspot.com/11573010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 1 | ||||
| -rw-r--r-- | media/filters/ffmpeg_video_decoder.cc | 1 | ||||
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 1 | ||||
| -rw-r--r-- | media/tools/media_bench/media_bench.cc | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index c0a64d1..4de80ce 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -152,7 +152,6 @@ class FFmpegTest : public testing::TestWithParam<const char*> { << av_codec_context->codec_id; av_codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - av_codec_context->err_recognition = AV_EF_CAREFUL; av_codec_context->thread_count = kDecodeThreads; EXPECT_EQ(0, avcodec_open2(av_codec_context, av_codec, NULL)) diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index b51ac66..d5bdb8e 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -479,7 +479,6 @@ bool FFmpegVideoDecoder::ConfigureDecoder() { // Enable motion vector search (potentially slow), strong deblocking filter // for damaged macroblocks, and set our error detection sensitivity. codec_context_->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - codec_context_->err_recognition = AV_EF_CAREFUL; codec_context_->thread_count = GetThreadCount(codec_context_->codec_id); codec_context_->opaque = this; codec_context_->flags |= CODEC_FLAG_EMU_EDGE; diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index b1b96e5..262d532e 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -210,7 +210,6 @@ int main(int argc, const char** argv) { } codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - codec_context->err_recognition = AV_EF_CAREFUL; // Initialize threaded decode. if (target_codec == AVMEDIA_TYPE_VIDEO && video_threads > 0) { diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 844372f..9d3e070 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -317,7 +317,6 @@ int main(int argc, const char** argv) { } if (error_correction) { codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - codec_context->err_recognition = AV_EF_CAREFUL; } // Initialize threaded decode. |