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/nut.h | |
| parent | 7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (diff) | |
| parent | bfe5454cd238b16e7977085f880205229103eccb (diff) | |
| download | ffmpeg-076300bf8b43d5d56a91cd2ad845d596969c87cf.tar.gz | |
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/nut.h')
| -rw-r--r-- | libavformat/nut.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nut.h b/libavformat/nut.h index deb3c901e3..ab31c27429 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -26,7 +26,7 @@ //#include "libavutil/adler32.h" //#include "libavcodec/mpegaudio.h" #include "avformat.h" -#include "riff.h" +#include "internal.h" #include "metadata.h" #define MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48)) |