diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-21 15:44:58 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-21 15:44:58 +0000 |
commit | 4b9ddc69a0c0baed309e7a277bb8e14e4edf3fe1 (patch) | |
tree | 7fd2c9187bf24bc7b4f976c423469c3046b56ca4 /libmpdemux/demux_lavf.c | |
parent | c300337919c98b15cb534191a62196e7d340f319 (diff) | |
download | mpv-4b9ddc69a0c0baed309e7a277bb8e14e4edf3fe1.tar.bz2 mpv-4b9ddc69a0c0baed309e7a277bb8e14e4edf3fe1.tar.xz |
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_lavf.c')
-rw-r--r-- | libmpdemux/demux_lavf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 0024d7a278..7e72adc549 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -67,7 +67,7 @@ extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); int64_t ff_gcd(int64_t a, int64_t b); -const AVCodecTag mp_wav_tags[] = { +static const AVCodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, @@ -86,7 +86,9 @@ const AVCodecTag mp_wav_tags[] = { { 0, 0 }, }; -const AVCodecTag mp_bmp_tags[] = { +const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0}; + +static const AVCodecTag mp_bmp_tags[] = { { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, @@ -99,6 +101,8 @@ const AVCodecTag mp_bmp_tags[] = { { 0, 0 }, }; +const struct AVCodecTag *mp_bmp_taglists[] = {codec_bmp_tags, mp_bmp_tags, 0}; + static int mp_open(URLContext *h, const char *filename, int flags){ return 0; } @@ -252,9 +256,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ priv->astreams[priv->audio_streams] = i; priv->audio_streams++; if(!codec->codec_tag) - codec->codec_tag= codec_get_wav_tag(codec->codec_id); - if(!codec->codec_tag) - codec->codec_tag= codec_get_tag(mp_wav_tags, codec->codec_id); + codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); wf->wFormatTag= codec->codec_tag; wf->nChannels= codec->channels; wf->nSamplesPerSec= codec->sample_rate; @@ -326,9 +328,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); if(!codec->codec_tag) - codec->codec_tag= codec_get_bmp_tag(codec->codec_id); - if(!codec->codec_tag) - codec->codec_tag= codec_get_tag(mp_bmp_tags, codec->codec_id); + codec->codec_tag= 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; |