From 8f7f2ad9e08400bead40c7e06613b0ba5f0b8aa5 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 29 Dec 2006 18:56:28 +0000 Subject: first step toward amr-nb muxing support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 1 + libmpdemux/muxer_lavf.c | 3 +++ 2 files changed, 4 insertions(+) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 5472505adf..f3a0d2dc26 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -87,6 +87,7 @@ const CodecTag mp_wav_tags[] = { { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')}, { CODEC_ID_XAN_DPCM, MKTAG('A', 'x', 'a', 'n')}, + { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, { 0, 0 }, }; diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 17cc80d00a..948b41b754 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -26,6 +26,7 @@ extern unsigned int codec_get_wav_tag(int id); extern enum CodecID codec_get_bmp_id(unsigned int tag); extern enum CodecID codec_get_wav_id(unsigned int tag); +extern const int mp_wav_tags[]; extern char *info_name; extern char *info_artist; @@ -209,6 +210,8 @@ static void fix_parameters(muxer_stream_t *stream) if(stream->type == MUXER_TYPE_AUDIO) { ctx->codec_id = codec_get_wav_id(stream->wf->wFormatTag); + if(!ctx->codec_id) + ctx->codec_id = codec_get_id(mp_wav_tags, stream->wf->wFormatTag); #if 0 //breaks aac in mov at least ctx->codec_tag = codec_get_wav_tag(ctx->codec_id); #endif -- cgit v1.2.3