summaryrefslogtreecommitdiff
path: root/libavformat/latmenc.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2013-01-16 18:27:14 -0300
committerMichael Niedermayer <michaelni@gmx.at>2013-01-17 04:55:14 +0100
commitb454c64e0311d813fef9c22cf34f83c2ce77ab23 (patch)
tree00ad2292c0827d34448aae03d309965c709157ba /libavformat/latmenc.c
parentc345100efc9baae0ea7c9fcc376725cae5d3df6e (diff)
downloadffmpeg-b454c64e0311d813fef9c22cf34f83c2ce77ab23.tar.gz
latmenc: Check for LOAS sync word
Write the packet unaltered if found. Fixes ticket #1917 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/latmenc.c')
-rw-r--r--libavformat/latmenc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index 233eab8382..9dfb4e4fab 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -156,6 +156,15 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be incorrectly muxed into LATM\n");
return AVERROR_INVALIDDATA;
}
+
+ if (!s->streams[0]->codec->extradata) {
+ if(pkt->size > 2 && pkt->data[0] == 0x56 && (pkt->data[1] >> 4) == 0xe &&
+ (AV_RB16(pkt->data + 1) & 0x1FFF) + 3 == pkt->size)
+ return ff_raw_write_packet(s, pkt);
+ else
+ return AVERROR_INVALIDDATA;
+ }
+
if (pkt->size > 0x1fff)
goto too_large;