diff options
| author | jstebbins <[email protected]> | 2011-10-26 17:53:34 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-10-26 17:53:34 +0000 |
| commit | 9539f510c2a59b4e220f2c5e3e09bfc53cf1742b (patch) | |
| tree | 97774a728b4a8bdb43ffaebf101fb4f7e09cc89d | |
| parent | af35427d0c2b53fda08e2857256ffa0e99db1aa7 (diff) | |
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
| -rw-r--r-- | contrib/ffmpeg/module.defs | 2 | ||||
| -rw-r--r-- | libhb/decavcodec.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index b71f197e3..87bead3e2 100644 --- 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 f8e5dc8c5..b6b662f84 100644 --- 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 ); } |