summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan <grigoriev.ivan.a@gmail.com>2016-04-12 16:32:04 -0400
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-28 03:47:13 +0200
commit0696a555b6a516ce569bb2320b512dc790e747b4 (patch)
treeffb366f556cca7ccfe2a038bbfae7eb466395a33
parent62e87d065b9bae0f9d5319a88c8af0a0c3bdd084 (diff)
downloadffmpeg-0696a555b6a516ce569bb2320b512dc790e747b4.tar.gz
avcodec/h264: Fix for H.264 configuration parsing
Sometimes video fails to decode if H.264 configuration changes mid stream. The reason is that configuration parser assumes that nal_ref_idc is equal to 11b while actually some codecs but 01b there. The H.264 spec is somewhat vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3a727606c474d3d0b9efa3c900294a84bdb5e331) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 1f5f4a0b20..692cd62d57 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1737,7 +1737,7 @@ static int is_extra(const uint8_t *buf, int buf_size)
const uint8_t *p= buf+6;
while(cnt--){
int nalsize= AV_RB16(p) + 2;
- if(nalsize > buf_size - (p-buf) || p[2]!=0x67)
+ if(nalsize > buf_size - (p-buf) || (p[2] & 0x9F) != 7)
return 0;
p += nalsize;
}
@@ -1746,7 +1746,7 @@ static int is_extra(const uint8_t *buf, int buf_size)
return 0;
while(cnt--){
int nalsize= AV_RB16(p) + 2;
- if(nalsize > buf_size - (p-buf) || p[2]!=0x68)
+ if(nalsize > buf_size - (p-buf) || (p[2] & 0x9F) != 8)
return 0;
p += nalsize;
}