In ts demuxer, support aac flexmux using extradata in iods, issue #2346

Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 8 insertions, 0 deletions

diff --git a/libavformat/isom.h b/libavformat/isom.h
index 6c6ad5459f..2990c9ce82 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -142,6 +142,14 @@ typedef struct MOVContext {
 } MOVContext;
 
 int ff_mp4_read_descr_len(ByteIOContext *pb);
+int ff_mp4_read_descr(AVFormatContext *fc, ByteIOContext *pb, int *tag);
+int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, ByteIOContext *pb);
+
+#define MP4IODescrTag                   0x02
+#define MP4ESDescrTag                   0x03
+#define MP4DecConfigDescrTag            0x04
+#define MP4DecSpecificDescrTag          0x05
+
 int ff_mov_read_esds(AVFormatContext *fc, ByteIOContext *pb, MOVAtom atom);
 enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags);