diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-02-01 18:34:51 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-02-01 22:46:27 +0200 |
| commit | cdb6d157ccb2d311afb72b7cbf128c3866e85ec6 (patch) | |
| tree | 94dfc8f8a2fc895d796657ea74e995fb33687ca5 /libmpdemux/demux_lavf.c | |
| parent | db8cdc73e38c3490389212d94ae9b92dfddd5975 (diff) | |
| download | mpv-cdb6d157ccb2d311afb72b7cbf128c3866e85ec6.tar.bz2 mpv-cdb6d157ccb2d311afb72b7cbf128c3866e85ec6.tar.xz | |
demux_lavf: use Libav RIFF tag lists directly
Change demux_lavf to use CodecID -> RIFF tag mappings that are now
available through the public Libav API. Previously it used a copy in
ffmpeg_files/taglists.c. That can now be deleted.
Diffstat (limited to 'libmpdemux/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index cf17664aab..02eff0d4b8 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -293,8 +293,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) if (matches_avinputformat_name(priv, "mpeg") || matches_avinputformat_name(priv, "mpegts")) codec->codec_tag = 0; - int override_tag = mp_av_codec_get_tag(mp_codecid_override_taglists, - codec->codec_id); + int override_tag = mp_taglist_override(codec->codec_id); // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag if (override_tag) codec->codec_tag = override_tag; @@ -313,8 +312,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) if (codec->codec_tag == MKTAG('m', 'p', '4', 'a')) codec->codec_tag = 0; if (!codec->codec_tag) - codec->codec_tag = mp_av_codec_get_tag(mp_wav_taglists, - codec->codec_id); + codec->codec_tag = mp_taglist_audio(codec->codec_id); wf->wFormatTag = codec->codec_tag; wf->nChannels = codec->channels; wf->nSamplesPerSec = codec->sample_rate; @@ -399,8 +397,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) codec->codec_tag = avcodec_pix_fmt_to_codec_tag(codec->pix_fmt); } if (!codec->codec_tag) - codec->codec_tag = mp_av_codec_get_tag(mp_bmp_taglists, - codec->codec_id); + codec->codec_tag = mp_taglist_video(codec->codec_id); bih->biSize = sizeof(*bih) + codec->extradata_size; bih->biWidth = codec->width; bih->biHeight = codec->height; |