From 8a2679ada43665f19eb8282e82f2acaad8ba4f84 Mon Sep 17 00:00:00 2001
From: Luca Abeni <lucabe72@email.it>
Date: Thu, 17 Jun 2010 10:30:52 +0000
Subject: [PATCH] Simplify (no need to check for st->codec->extradata) and
correct (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
---
libavformat/rtpenc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 5abd490cc43..3a541dd2838 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -133,8 +133,7 @@ static int rtp_write_header(AVFormatContext *s1)
break;
case CODEC_ID_H264:
/* check for H.264 MP4 syntax */
- if (st->codec->extradata_size > 0 && st->codec->extradata &&
- st->codec->extradata[0] == 1) {
+ if (st->codec->extradata_size > 4 && st->codec->extradata[0] == 1) {
s->nal_length_size = (st->codec->extradata[4] & 0x03) + 1;
}
break;
--
GitLab