diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-09-30 17:28:28 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-10-04 11:58:53 +0200 |
| commit | 12bd8532cf09883e5d1f1ec817c18a376147deb8 (patch) | |
| tree | d80b1f77416ebea1629174e4fe073634fa41931c /libavformat/isom.c | |
| parent | 7d49f79f1cd47783a963a757a6563b9cac29db62 (diff) | |
| download | ffmpeg-12bd8532cf09883e5d1f1ec817c18a376147deb8.tar.gz | |
Synchronize various 4CCs and codec tags from FFmpeg.
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 896730c5a6..d7c0af101e 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -204,6 +204,8 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ + { CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server */ + { CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */ { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */ { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') }, { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ @@ -259,6 +261,7 @@ const AVCodecTag codec_movaudio_tags[] = { { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, + { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */ { CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */ { CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, @@ -271,6 +274,8 @@ const AVCodecTag codec_movaudio_tags[] = { { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, + { CODEC_ID_SPEEX, MKTAG('s','p','e','x') }, /* Flash Media Server */ + { CODEC_ID_WMAV2, MKTAG('W', 'M', 'A', '2') }, { CODEC_ID_NONE, 0 }, |