Module: libav Branch: master Commit: cdaa1f84fb6f6e8234e95e9322c647c6a432e0bf
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Mon Nov 26 23:23:01 2012 -0500 lavf: move "MP3 " fourcc from riff to nut Original commit, 7b24f9b, says it was added because it is used in libnut. --- libavformat/nut.c | 1 + libavformat/riff.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/nut.c b/libavformat/nut.c index 65fadbf..196e04e 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -145,6 +145,7 @@ const AVCodecTag ff_nut_audio_tags[] = { { AV_CODEC_ID_PCM_U32LE, MKTAG('P', 'U', 'D', 32 ) }, { AV_CODEC_ID_PCM_U8, MKTAG('P', 'U', 'D', 8 ) }, { AV_CODEC_ID_PCM_S16LE_PLANAR, MKTAG('P', 'S', 'P', 16 ) }, + { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, { AV_CODEC_ID_NONE, 0 } }; diff --git a/libavformat/riff.c b/libavformat/riff.c index 190504c..fde1131 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -348,7 +348,6 @@ const AVCodecTag ff_codec_wav_tags[] = { // for NuppelVideo (nuv.c) { AV_CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') }, { AV_CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') }, - { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, { AV_CODEC_ID_NONE, 0 }, }; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
