[FFmpeg-cvslog] Dont be so picky on decoding pps in extradata.

Michael Niedermayer git at videolan.org
Sun Apr 3 18:20:08 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  1 15:59:00 2011 +0100| [6e77feb201924f16bd69cbb5cfabb1a7b5e8a52e] | committer: Michael Niedermayer

Dont be so picky on decoding pps in extradata.
Fixes issue2517

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

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

 libavcodec/h264.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e082320..51ca7a4 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -986,7 +986,7 @@ int ff_h264_decode_extradata(H264Context *h)
         cnt = *(p++); // Number of pps
         for (i = 0; i < cnt; i++) {
             nalsize = AV_RB16(p) + 2;
-            if(decode_nal_units(h, p, nalsize)  != nalsize) {
+            if(decode_nal_units(h, p, nalsize) < 0) {
                 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
                 return -1;
             }



More information about the ffmpeg-cvslog mailing list