[vlc-commits] avcodec: fix error resilience setting (renamed a while to recognition)

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Mar  2 11:40:40 2012 -0500| [b3cd3651868cce57d54e94c6662a383f7d94444e] | committer: Rafaël Carré

avcodec: fix error resilience setting (renamed a while to recognition)

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b3cd3651868cce57d54e94c6662a383f7d94444e
---

 modules/codec/avcodec/video.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 7332bf0..60ce6b6 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -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;