diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-30 23:01:36 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-30 23:01:36 +0000 |
| commit | 74f6a6ba52e84a9941170b19860c3134272d8e3d (patch) | |
| tree | 3b04dad4c79cc757b03206318f75f5897196161b /libmpdemux | |
| parent | ae6e3b9fc2e53085864d4413ed63d2c09b7426a2 (diff) | |
| download | mpv-74f6a6ba52e84a9941170b19860c3134272d8e3d.tar.bz2 mpv-74f6a6ba52e84a9941170b19860c3134272d8e3d.tar.xz | |
Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
it now can be used for both audio and video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 3 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 5 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 3093b22d1e..e89b3914f0 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -221,7 +221,8 @@ 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, override_tag = av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); + int g, override_tag = 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; diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index ad1eb766ec..1e7b1708a0 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -54,7 +54,7 @@ static const AVCodecTag mp_wav_tags[] = { const struct AVCodecTag *mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0}; -static const AVCodecTag mp_wav_override_tags[] = { +static const AVCodecTag mp_codecid_override_tags[] = { { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_PCM_U8, 1}, { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, @@ -71,7 +71,8 @@ static const AVCodecTag mp_wav_override_tags[] = { { 0, 0 }, }; -const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0}; +const struct AVCodecTag *mp_codecid_override_taglists[] = + {mp_codecid_override_tags, 0}; static const AVCodecTag mp_bmp_tags[] = { { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')}, diff --git a/libmpdemux/mp_taglists.h b/libmpdemux/mp_taglists.h index a5262652b7..5df8648c84 100644 --- a/libmpdemux/mp_taglists.h +++ b/libmpdemux/mp_taglists.h @@ -21,7 +21,7 @@ extern const struct AVCodecTag *mp_wav_taglists[]; -extern const struct AVCodecTag *mp_wav_override_taglists[]; +extern const struct AVCodecTag *mp_codecid_override_taglists[]; extern const struct AVCodecTag *mp_bmp_taglists[]; |