[SCM] libav/experimental: h264: drop commented out cruft

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:00 UTC 2014


The following commit has been merged in the experimental branch:
commit 9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521
Author: Anton Khirnov <anton at khirnov.net>
Date:   Tue Apr 29 11:13:43 2014 +0200

    h264: drop commented out cruft

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index aed2378..cc1b896 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -730,9 +730,6 @@ static int h264_frame_start(H264Context *h)
     memset(h->slice_table, -1,
            (h->mb_height * h->mb_stride - 1) * sizeof(*h->slice_table));
 
-    // s->decode = (s->flags & CODEC_FLAG_PSNR) || !s->encoding ||
-    //             s->current_picture.f.reference /* || h->contains_intra */ || 1;
-
     /* We mark the current picture as non-reference after allocating it, so
      * that if we break out due to an error it can be released automatically
      * in the next ff_MPV_frame_start().

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list