Mercurial > mplayer.hg

changeset 34990:8c607010a960

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-enable nonref DR again.
author reimar
date Sun, 12 Aug 2012 18:15:13 +0000
parents 882311d5cb8f
children d0223a72b0ba
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Sun Aug 12 18:13:42 2012 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun Aug 12 18:15:13 2012 +0000
@@ -248,11 +248,6 @@
     if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH)
         ctx->do_dr1=1;
     ctx->nonref_dr = lavc_codec->id == CODEC_ID_H264;
-    // temporarily disable nonref_dr for 1.1 release
-    if (ctx->nonref_dr) {
-        ctx->do_dr1 = 0;
-        ctx->nonref_dr = 0;
-    }
     ctx->ip_count= ctx->b_count= 0;
 
     ctx->pic = avcodec_alloc_frame();