[SCM] libav/experimental: error_resilience = FF_ER_CAREFULL

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b7b84107b54e795b4bfd5c67ce2536c4d6f559cd
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Jul 11 22:15:58 2005 +0000

    error_resilience = FF_ER_CAREFULL
    
    Originally committed as revision 4433 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index dfa38a1..aba78c4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -179,7 +179,7 @@ static int do_deinterlace = 0;
 static int do_interlace_dct = 0;
 static int do_interlace_me = 0;
 static int workaround_bugs = FF_BUG_AUTODETECT;
-static int error_resilience = 2;
+static int error_resilience = FF_ER_CAREFULL;
 static int error_concealment = 3;
 static int dct_algo = 0;
 static int idct_algo = 0;

-- 
Libav/FFmpeg packaging