diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:45:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:45:57 +0100 |
| commit | 076300bf8b43d5d56a91cd2ad845d596969c87cf (patch) | |
| tree | 487b8a917a0125e4cc086ccbcf575727ebb0b289 /libavformat/riff.c | |
| parent | 7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (diff) | |
| parent | bfe5454cd238b16e7977085f880205229103eccb (diff) | |
Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
lavf: move "MP3 " fourcc from riff to nut
fate: vpx: Add dependencies
fate: Fix wavpack-matroskamode test dependencies
x86: dsputilenc: port to cpuflags
Conflicts:
libavformat/internal.h
libavformat/nut.c
tests/fate/vpx.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 5ad0eb01c8..cddbec477c 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -389,7 +389,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 }, }; |