]> git.sesse.net Git - vlc/commitdiff
avcodec: fix error resilience setting (renamed a while to recognition)
authorRafaël Carré <funman@videolan.org>
Fri, 2 Mar 2012 16:40:40 +0000 (11:40 -0500)
committerRafaël Carré <funman@videolan.org>
Fri, 2 Mar 2012 16:43:20 +0000 (11:43 -0500)
The field was renamed in lavc54 and setting values changed from
enum to bitfield.
We don't need to care about this because VLC doesn't specify values.

modules/codec/avcodec/video.c

index 7332bf078c11308627587380b9b03aa6e3e8c228..60ce6b66d52f584d9e4a0484055c7cdae9c99aa3 100644 (file)
@@ -237,10 +237,10 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
         var_InheritInteger( p_dec, "ffmpeg-workaround-bugs" );
 #if LIBAVCODEC_VERSION_MAJOR < 54
     p_sys->p_context->error_recognition =
-        var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
 #else
-# warning FIXME (moved to AVFormat)
+    p_sys->p_context->err_recognition =
 #endif
+        var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
 
     if( var_CreateGetBool( p_dec, "grayscale" ) )
         p_sys->p_context->flags |= CODEC_FLAG_GRAY;