diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:52:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:52:08 +0200 |
| commit | bbdef61850205f5af1a0a292fb7166c92726e93b (patch) | |
| tree | 773bda2397cb13a4586d311615986ad6ca919d8a /libavformat/riff.c | |
| parent | 84f77f84234e409271852692e736900ee7b2f0fe (diff) | |
| parent | 508998f7d5cc61c7ac7b049813b47adc24c6e282 (diff) | |
| download | ffmpeg-bbdef61850205f5af1a0a292fb7166c92726e93b.tar.gz | |
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
avf: move riff tags accessors where they belong
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 119cbc9399..f0434c3d76 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -462,6 +462,16 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid) return AV_CODEC_ID_NONE; } +const struct AVCodecTag *avformat_get_riff_video_tags(void) +{ + return ff_codec_bmp_tags; +} + +const struct AVCodecTag *avformat_get_riff_audio_tags(void) +{ + return ff_codec_wav_tags; +} + #if CONFIG_MUXERS int64_t ff_start_tag(AVIOContext *pb, const char *tag) { |