aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorC Chatterjee <cchatterj@hotmail.com>2012-03-12 05:21:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-12 05:21:59 +0100
commit3c9a86df0e20dd1c90a9b390a6555b22f87aa8cd (patch)
tree620b4e64b675356459cc2f5253d4ae3736fc5d39
parent86b6e49d921b0debca9be66732fd61ac43f7b08d (diff)
downloadffmpeg-3c9a86df0e20dd1c90a9b390a6555b22f87aa8cd.tar.gz
flvenc: Remove apparently unneeded AAC check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/flvenc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index d4820f4f58..a6dab06875 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -445,10 +445,6 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)
return -1;
}
- } 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;
}
if (flv->delay == AV_NOPTS_VALUE)
flv->delay = -pkt->dts;