chinese avs demuxing support, demux AVSFileFormat.mp4

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

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 56c69eb..4a5e3f9 100644 (file)
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -123,6 +123,7 @@ const AVCodecTag codec_movvideo_tags[] = {
     { CODEC_ID_PNG,   MKTAG('p', 'n', 'g', ' ') },
 
     { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */
+    { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') },
 
     { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
     { CODEC_ID_SGI,   MKTAG('s', 'g', 'i', ' ') }, /* SGI  */

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 76c25a3..1baa460 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1634,6 +1634,7 @@ static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 }
 
 static const MOVParseTableEntry mov_default_parse_table[] = {
+{ MKTAG('a','v','s','s'), mov_read_extradata },
 { MKTAG('c','o','6','4'), mov_read_stco },
 { MKTAG('c','t','t','s'), mov_read_ctts }, /* composition time to sample */
 { MKTAG('d','i','n','f'), mov_read_default },