RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
cehoyos 2009-08-30 23:01:36 +00:00
parent ae6e3b9fc2
commit 74f6a6ba52
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmpdemux/demux_lavf.c
View File

@ -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;

5
libmpdemux/mp_taglists.c
View File

@ -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')},

2
libmpdemux/mp_taglists.h
View File

@ -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[];