diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-30 11:41:46 +0400 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-04-02 14:57:35 +0400 |
| commit | 38cd7f66b73a2c0bd91d121f64943ba44e18d93e (patch) | |
| tree | 90aa1db622b573327fe0a265ebc1fb5880c5daa4 | |
| parent | 402bc31d87871a8a87056c51f58cc21841a29c6f (diff) | |
Write broken aac frames to mov files instead of skipping them.
Fixes decoding with picky media players.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b448c0a68d0cc7dfef736267dfdaed0e213c020b)
Conflicts:
libavformat/movenc.c
| -rw-r--r-- | libavformat/movenc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1526944a53..43bda7f811 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2249,6 +2249,14 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) return -1; } + if (enc->codec_id == CODEC_ID_AAC && pkt->size > 2 && + (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { + if (!s->streams[pkt->stream_index]->nb_frames) { + av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n"); + return -1; + } + av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); + } if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) { /* from x264 or from bytestream h264 */ /* nal reformating needed */ @@ -2262,13 +2270,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) trk->cluster[trk->entry].data= buf; }else 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) { - if (!s->streams[pkt->stream_index]->nb_frames) { - av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n"); - return -1; - } - av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); } else if (mov->frag_seq_num>0){ trk->cluster[trk->entry].data = av_malloc(size); if (!trk->cluster[trk->entry].data) |