bump ffmpeg to v0.7-1470-gb95fbba

Fixes problem setting dsur_mode in ac3 encoder that caused encode
failures if using ac3 encoder and mixdown is dolby or dplii.
Fixes a VC-1 decode issue that caused scattered misplaced blocks.
Fixes swscale bug that caused banding.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4322 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index b71f197e354a67e32afc6abe5a349c4df26f3f7c..87bead3e20219ea101d6b638dc933dc16ceb9e02 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1318-g91038cd.tar.bz2
+FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1470-gb95fbba.tar.bz2
 
 FFMPEG.CONFIGURE.deps =
 FFMPEG.CONFIGURE.env  =

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index f8e5dc8c5d88f329a9c1f278e9b4107977698d60..b6b662f84712b672d56c454a018a9f10e9cebe32 100644 (file)
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -1009,7 +1009,9 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
         pv->context = avcodec_alloc_context3(codec);
         avcodec_copy_context( pv->context, ic->streams[pv->title->video_id]->codec);
         pv->context->workaround_bugs = FF_BUG_AUTODETECT;
-        pv->context->error_recognition = 1;
+        // Depricated but still used by Libav (twits!)
+        pv->context->error_recognition = FF_ER_CAREFUL;
+        pv->context->err_recognition = AV_EF_CRCCHECK;
         pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
 
         if ( hb_avcodec_open( pv->context, codec, NULL, pv->threads ) )
@@ -1032,7 +1034,9 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
         pv->parser = av_parser_init( w->codec_param );
         pv->context = avcodec_alloc_context3( codec );
         pv->context->workaround_bugs = FF_BUG_AUTODETECT;
-        pv->context->error_recognition = 1;
+        // Depricated but still used by Libav (twits!)
+        pv->context->error_recognition = FF_ER_CAREFUL;
+        pv->context->err_recognition = AV_EF_CRCCHECK;
         pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
         init_video_avcodec_context( pv );
     }