[FFmpeg-cvslog] Write broken aac frames to mov files instead of skipping them.

[Carl Eugen Hoyos]

ffmpeg | branch: release/0.10 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Mar 30 08:41:46 2013 +0100| [8b72bcba713ae2dd48c260265010c9831dffdc30] | committer: Carl Eugen Hoyos

Write broken aac frames to mov files instead of skipping them.

Fixes decoding with picky media players.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b448c0a68d0cc7dfef736267dfdaed0e213c020b)

Conflicts:
	libavformat/movenc.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b72bcba713ae2dd48c260265010c9831dffdc30
---

 libavformat/movenc.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index fdde517..94e7182 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2583,6 +2583,14 @@ static int mov_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
         memcpy(trk->vosData, enc->extradata, trk->vosLen);
     }
 
+    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 */
@@ -2593,13 +2601,6 @@ static int mov_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
         } 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 {
         avio_write(pb, pkt->data, size);
     }