# HG changeset patch # User reimar # Date 1359916976 0 # Node ID 208dc40a26b267c3cf8af77d1d8cdd939749a995 # Parent 3e1597463be1555ed74e056412971097ceb2fc53 Correctly disable dr for H.264. When I disabled nonref-dr I by accident enabled full DR instead of disabling it, causing even more (though different) issues. diff -r 3e1597463be1 -r 208dc40a26b2 libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Fri Feb 01 18:30:34 2013 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Sun Feb 03 18:42:56 2013 +0000 @@ -261,12 +261,16 @@ if (lavc_codec->capabilities & CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO && + lavc_codec->id != AV_CODEC_ID_H264 && lavc_codec->id != AV_CODEC_ID_VP8) ctx->do_dr1=1; // TODO: fix and enable again. This currently causes issues when using filters // and seeking, usually failing with the "Ran out of numbered images" message, // but bugzilla #2118 might be related as well. - //ctx->nonref_dr = lavc_codec->id == AV_CODEC_ID_H264; + if (0 && lavc_codec->id == AV_CODEC_ID_H264) { + ctx->do_dr1 = 1; + ctx->nonref_dr = 1; + } ctx->ip_count= ctx->b_count= 0; ctx->pic = avcodec_alloc_frame();