[SCM] libav/experimental: h264: codec reinit: remove statements without effect

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 34c5a6660a9e5e3cf301691bb29d011638953dc2
Author: Janne Grunau <janne-libav at jannau.net>
Date:   Fri Apr 18 12:07:52 2014 +0000

    h264: codec reinit: remove statements without effect
    
    avctx->coded_{height,width} will always equal h->{height,width} since
    init_dimensions() does that explicitly, Size changes are detected by
    changes in mb_{height,width} earlier and propagated through the
    needs_reinit variable.

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 897c8eb..aed2378 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1306,10 +1306,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
         }
     }
 
-    if (h->context_initialized &&
-        (h->width  != h->avctx->coded_width   ||
-         h->height != h->avctx->coded_height  ||
-         needs_reinit)) {
+    if (h->context_initialized && needs_reinit) {
         if (h != h0) {
             av_log(h->avctx, AV_LOG_ERROR,
                    "changing width %d -> %d / height %d -> %d on "

-- 
Libav/FFmpeg packaging