diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
| commit | 0e1b7765be878491565cf5e471f22b15e106164c (patch) | |
| tree | 422e500c289335182a2a64934dcabf10b95e32dc /libmpdemux/demux_lavf.c | |
| parent | a9618c1c6fe9424dfaeb1677348e0382d7252554 (diff) | |
| parent | dcfd043ea8d0c46929aad78596314d837c290d39 (diff) | |
| download | mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2 mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz | |
Merge svn changes up to r29644
Diffstat (limited to 'libmpdemux/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 344a71d615..fb89accaf3 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -220,11 +220,14 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { AVStream *st= avfc->streams[i]; AVCodecContext *codec= st->codec; AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0); - int g; + int g, override_tag = mp_av_codec_get_tag(mp_codecid_override_taglists, + codec->codec_id); + // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag + if (override_tag) + codec->codec_tag = override_tag; switch(codec->codec_type){ case CODEC_TYPE_AUDIO:{ - int override_tag; WAVEFORMATEX *wf; sh_audio_t* sh_audio; sh_audio=new_sh_audio(demuxer, i); @@ -234,10 +237,6 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { priv->astreams[priv->audio_streams] = 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= 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 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a')) codec->codec_tag= 0; |