mirror of https://github.com/mpv-player/mpv
Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of
reimplementing that functionality. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1ea5135f6f
commit
873d120347
|
@ -242,8 +242,6 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
|
||||||
// mp4a tag is used for all mp4 files no matter what they actually contain
|
// mp4a tag is used for all mp4 files no matter what they actually contain
|
||||||
if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
|
if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
|
||||||
codec->codec_tag= 0;
|
codec->codec_tag= 0;
|
||||||
if(codec->codec_id == CODEC_ID_ADPCM_IMA_AMV)
|
|
||||||
codec->codec_tag= MKTAG('A','M','V','A');
|
|
||||||
if(!codec->codec_tag)
|
if(!codec->codec_tag)
|
||||||
codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
|
codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
|
||||||
wf->wFormatTag= codec->codec_tag;
|
wf->wFormatTag= codec->codec_tag;
|
||||||
|
|
|
@ -58,6 +58,7 @@ const struct AVCodecTag * const mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_t
|
||||||
static const AVCodecTag mp_codecid_override_tags[] = {
|
static const AVCodecTag mp_codecid_override_tags[] = {
|
||||||
{ CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')},
|
{ CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')},
|
||||||
{ CODEC_ID_AC3, 0x2000},
|
{ CODEC_ID_AC3, 0x2000},
|
||||||
|
{ CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')},
|
||||||
{ CODEC_ID_DTS, 0x2001},
|
{ CODEC_ID_DTS, 0x2001},
|
||||||
{ CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},
|
{ CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},
|
||||||
{ CODEC_ID_H264, MKTAG('H', '2', '6', '4')},
|
{ CODEC_ID_H264, MKTAG('H', '2', '6', '4')},
|
||||||
|
|
Loading…
Reference in New Issue