diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-22 05:00:25 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-26 06:16:52 +0300 |
| commit | 9ce0838ffd01371bd5b62fae38f94ce23d5339bb (patch) | |
| tree | 4d787831ce5678ffa061e7c3a4b198744601b649 /libmpdemux/demux_lavf.c | |
| parent | cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4 (diff) | |
| download | mpv-9ce0838ffd01371bd5b62fae38f94ce23d5339bb.tar.bz2 mpv-9ce0838ffd01371bd5b62fae38f94ce23d5339bb.tar.xz | |
Use own mp_*_taglists code instead of libavformat internals
Use the version of code under ffmpeg_files/ instead of relying on
libavformat source files to be available.
Diffstat (limited to 'libmpdemux/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 310ec83c09..1c25edf160 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -235,7 +235,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { priv->audio_streams++; wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag - override_tag= av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); + override_tag= mp_av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); if (override_tag) codec->codec_tag= override_tag; // mp4a tag is used for all mp4 files no matter what they actually contain @@ -244,7 +244,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { if(codec->codec_id == CODEC_ID_ADPCM_IMA_AMV) codec->codec_tag= MKTAG('A','M','V','A'); if(!codec->codec_tag) - codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); + codec->codec_tag= mp_av_codec_get_tag(mp_wav_taglists, codec->codec_id); wf->wFormatTag= codec->codec_tag; wf->nChannels= codec->channels; wf->nSamplesPerSec= codec->sample_rate; @@ -322,7 +322,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { } } if(!codec->codec_tag) - codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id); + codec->codec_tag= mp_av_codec_get_tag(mp_bmp_taglists, codec->codec_id); bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size; bih->biWidth= codec->width; bih->biHeight= codec->height; |