RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 3a727606c4)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Ivan 2016-04-12 16:32:04 -04:00 committed by Michael Niedermayer
parent 97ebe5978e
commit 8f937fdf04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -1821,7 +1821,7 @@ static int is_extra(const uint8_t *buf, int buf_size)
const uint8_t *p= buf+6; const uint8_t *p= buf+6;
while(cnt--){ while(cnt--){
int nalsize= AV_RB16(p) + 2; 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; return 0;
p += nalsize; p += nalsize;
} }
@ -1830,7 +1830,7 @@ static int is_extra(const uint8_t *buf, int buf_size)
return 0; return 0;
while(cnt--){ while(cnt--){
int nalsize= AV_RB16(p) + 2; 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; return 0;
p += nalsize; p += nalsize;
} }