diff options
Diffstat (limited to 'media/test/ffmpeg_tests/ffmpeg_tests.cc')
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index d594c4e..5745fe9 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -33,7 +33,7 @@ #if defined(OS_WIN) // Enable to build with exception handler -// #define ENABLE_WINDOWS_EXCEPTIONS 1 +//#define ENABLE_WINDOWS_EXCEPTIONS 1 #ifdef ENABLE_WINDOWS_EXCEPTIONS // warning: disable warning about exception handler. @@ -221,6 +221,13 @@ int main(int argc, const char** argv) { return 1; } + // TODO(fbarchard): On next ffmpeg roll, retest if this work around is needed. + if (codec_context->codec_id == CODEC_ID_THEORA) { + std::cerr << "Warning: Disabling threads to avoid Theora bug " + << in_path.value() << std::endl; + video_threads = 1; + } + codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; codec_context->error_recognition = FF_ER_CAREFUL; |