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/utils.c | |
| parent | 84f77f84234e409271852692e736900ee7b2f0fe (diff) | |
| parent | 508998f7d5cc61c7ac7b049813b47adc24c6e282 (diff) | |
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/utils.c')
| -rw-r--r-- | libavformat/utils.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index c2df2c6392..c955cf4bc3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4128,15 +4128,6 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels, return 0; } -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; -} - AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame) { AVRational undef = {0, 1}; |