diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-28 21:32:09 -0800 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-04-18 14:30:14 -0700 |
| commit | c22f2527ed33c429022dee6ee9e70c349145343e (patch) | |
| tree | d8ae45e00debff5a3f81017ce37552d288a61d90 /libavformat/movenc.c | |
| parent | 77f6b4d58eb76f4dbf208a8bfbd3dbf6e06da8f4 (diff) | |
In mov and flv muxer, check aac bitstream validity.
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5bc356279a..eec61fed66 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1993,6 +1993,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) /* from x264 or from bytestream h264 */ /* nal reformating needed */ size = ff_avc_parse_nal_units(pb, pkt->data, pkt->size); + } else if (enc->codec_id == CODEC_ID_AAC && pkt->size > 2 && + (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { + av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n"); + return -1; } else { avio_write(pb, pkt->data, size); } |