aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-01 15:59:00 +0100
committerAnton Khirnov <anton@khirnov.net>2011-06-13 20:45:09 +0200
commit108f318d908c552d88bc7570515e4ddb9ea45e3d (patch)
treee936bdcebf240ae0473ec04c6fc2f5dba003966e /libavcodec
parent3de33b00de219a749f3e5c9d1f1f68d7cfa58502 (diff)
downloadffmpeg-108f318d908c552d88bc7570515e4ddb9ea45e3d.tar.gz
h264: don't be so picky on decoding pps in extradata.
Fixes issue2517 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e1fcb62a7b..276d6e6d6c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -995,7 +995,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;
}