[FFmpeg-cvslog] isom: sort and pretty-print codec_movaudio_tags[]
Justin Ruggles
git at videolan.org
Sat Dec 10 02:08:52 CET 2011
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Tue Dec 6 18:02:14 2011 -0500| [4c386333529dd773e673e1366d1f6243d2c5af92] | committer: Justin Ruggles
isom: sort and pretty-print codec_movaudio_tags[]
original order is retained within the same tag or codec id to maintain the
muxing/demuxing priority.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c386333529dd773e673e1366d1f6243d2c5af92
---
libavformat/isom.c | 97 ++++++++++++++++++++++-----------------------------
1 files changed, 42 insertions(+), 55 deletions(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 00aecd4..6eb1827 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -223,61 +223,48 @@ const AVCodecTag codec_movvideo_tags[] = {
};
const AVCodecTag codec_movaudio_tags[] = {
- { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') },
- { CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') },
- { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
- { CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') },
- { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') },
- { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') },
- { CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') },
- { CODEC_ID_PCM_F32BE, MKTAG('f', 'l', '3', '2') },
- { CODEC_ID_PCM_F32LE, MKTAG('f', 'l', '3', '2') },
- { CODEC_ID_PCM_F64BE, MKTAG('f', 'l', '6', '4') },
- { CODEC_ID_PCM_F64LE, MKTAG('f', 'l', '6', '4') },
- { CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') },
- { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') },
- { CODEC_ID_PCM_U8, MKTAG('N', 'O', 'N', 'E') },
- { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') },
- { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') },
-
- { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') },
-
- { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') },
- { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') },
-
- { CODEC_ID_MP1, MKTAG('.', 'm', 'p', '1') },
- { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') },
-
- { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') },
- { CODEC_ID_MP3, 0x6D730055 },
-
- { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') },
- { CODEC_ID_AC3, MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */
- { CODEC_ID_AC3, MKTAG('s', 'a', 'c', '3') }, /* Nero Recode */
- { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* mp4ra.org */
- { CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */
-
- { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
- { 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') },
-
- { CODEC_ID_QCELP, MKTAG('Q','c','l','p') },
- { CODEC_ID_QCELP, MKTAG('Q','c','l','q') },
- { CODEC_ID_QCELP, MKTAG('s','q','c','p') }, /* ISO Media fourcc */
-
- { CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') },
- { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') },
-
- { 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_AAC, MKTAG('m', 'p', '4', 'a') },
+ { CODEC_ID_AC3, MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */
+ { CODEC_ID_AC3, MKTAG('s', 'a', 'c', '3') }, /* Nero Recode */
+ { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') },
+ { CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') },
+ { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
+ { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */
+ { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* mp4ra.org */
+ { CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */
+ { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') },
+ { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') },
+ { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') },
+ { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') },
+ { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') },
+ { CODEC_ID_MP1, MKTAG('.', 'm', 'p', '1') },
+ { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') },
+ { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') },
+ { CODEC_ID_MP3, 0x6D730055 },
+ { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */
+ { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') },
+ { CODEC_ID_PCM_F32BE, MKTAG('f', 'l', '3', '2') },
+ { CODEC_ID_PCM_F32LE, MKTAG('f', 'l', '3', '2') },
+ { CODEC_ID_PCM_F64BE, MKTAG('f', 'l', '6', '4') },
+ { CODEC_ID_PCM_F64LE, MKTAG('f', 'l', '6', '4') },
+ { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') },
+ { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') },
+ { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') },
+ { CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') },
+ { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
+ { CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') },
+ { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') },
+ { CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') },
+ { CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') },
+ { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') },
+ { CODEC_ID_PCM_U8, MKTAG('N', 'O', 'N', 'E') },
+ { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p') },
+ { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'q') },
+ { CODEC_ID_QCELP, MKTAG('s', 'q', 'c', 'p') }, /* ISO Media fourcc */
+ { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') },
+ { CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') },
+ { CODEC_ID_SPEEX, MKTAG('s', 'p', 'e', 'x') }, /* Flash Media Server */
+ { CODEC_ID_WMAV2, MKTAG('W', 'M', 'A', '2') },
{ CODEC_ID_NONE, 0 },
};
More information about the ffmpeg-cvslog
mailing list