summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-01 15:59:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-04-03 16:40:11 +0200
commit6e77feb201924f16bd69cbb5cfabb1a7b5e8a52e (patch)
tree75aaa34d9b6e6a750310d8d34dce1d6bd127187e /libavcodec
parent116758a358a2f176a27d521723a6c6c4d2ef52c7 (diff)
Dont be so picky on decoding pps in extradata.
Fixes issue2517 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 e082320ec5..51ca7a4c79 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;
}