[FFmpeg-cvslog] h264: Try parsing SPS as complete NAL in more cases

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 00:46:15 2013 +0200| [443b29e475a63cbfc573bddf46c4cb5ce7b5f461] | committer: Michael Niedermayer

h264: Try parsing SPS as complete NAL in more cases

Fixes Ticket2580

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=443b29e475a63cbfc573bddf46c4cb5ce7b5f461
---

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index efce095..233a7c8 100644
--- 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)