har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify (no need to check for st->codec->extradata) and correct

Browse Source 
(extradata_size must be at least 5 bytes) the H.264 MP4 syntax check
in rtpenc.c

Originally committed as revision 23638 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2010-06-17 10:30:52 +00:00
parent 701935968d
commit 8a2679ada4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtpenc.c
View File

@ -133,8 +133,7 @@ static int rtp_write_header(AVFormatContext *s1)
break; break;
case CODEC_ID_H264: case CODEC_ID_H264:
/* check for H.264 MP4 syntax */ /* check for H.264 MP4 syntax */
if (st->codec->extradata_size > 0 && st->codec->extradata && if (st->codec->extradata_size > 4 && st->codec->extradata[0] == 1) {
st->codec->extradata[0] == 1) {
s->nal_length_size = (st->codec->extradata[4] & 0x03) + 1; s->nal_length_size = (st->codec->extradata[4] & 0x03) + 1;
} }
break; break;