Revision c22f2527

View differences:

libavformat/flvenc.c
18 18
 * License along with FFmpeg; if not, write to the Free Software
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21

  
22
#include "libavutil/intreadwrite.h"
21 23
#include "avformat.h"
22 24
#include "flv.h"
23 25
#include "internal.h"
......
402 404
        }
403 405
        if (!flv->delay && pkt->dts < 0)
404 406
            flv->delay = -pkt->dts;
407
    } else if (enc->codec_id == CODEC_ID_AAC && pkt->size > 2 &&
408
               (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {
409
        av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n");
410
        return -1;
405 411
    }
406 412

  
407 413
    ts = pkt->dts + flv->delay; // add delay to force positive dts
libavformat/movenc.c
1993 1993
        /* from x264 or from bytestream h264 */
1994 1994
        /* nal reformating needed */
1995 1995
        size = ff_avc_parse_nal_units(pb, pkt->data, pkt->size);
1996
    } else if (enc->codec_id == CODEC_ID_AAC && pkt->size > 2 &&
1997
               (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {
1998
        av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n");
1999
        return -1;
1996 2000
    } else {
1997 2001
        avio_write(pb, pkt->data, size);
1998 2002
    }

Also available in: Unified diff