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/internal.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/internal.h')
| -rw-r--r-- | libavformat/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 4a9ed53def..4f740c99d1 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -355,6 +355,10 @@ void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st, int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux); +unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); + +enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); + /** * Chooses a timebase for muxing the specified stream. * |