Merge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index efce095da060f51c5e7885dc3604e6217db73ba5..233a7c844ff40da8758b11565131352e895546da 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4777,7 +4777,7 @@ again:
                 break;
             case NAL_SPS:
                 init_get_bits(&h->gb, ptr, bit_length);
-                if (ff_h264_decode_seq_parameter_set(h) < 0 && (h->is_avc ? (nalsize != consumed) && nalsize : 1)) {
+                if (ff_h264_decode_seq_parameter_set(h) < 0 && (h->is_avc ? nalsize : 1)) {
                     av_log(h->avctx, AV_LOG_DEBUG,
                            "SPS decoding failure, trying again with the complete NAL\n");
                     if (h->is_avc)