Mercurial > mplayer.hg

diff libmpdemux/muxer_lavf.c @ 34155:505b49b171f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags. This fixes linking against latest FFmpeg dynamic libs.
author reimar
date Sun, 23 Oct 2011 12:12:43 +0000
parents f27fe61c62f7
children 8f919281f8ca
line wrap: on
line diff
--- a/libmpdemux/muxer_lavf.c	Sun Oct 23 12:03:40 2011 +0000
+++ b/libmpdemux/muxer_lavf.c	Sun Oct 23 12:12:43 2011 +0000
@@ -190,7 +190,7 @@
 
 	if(stream->type == MUXER_TYPE_AUDIO)
 	{
-		ctx->codec_id = av_codec_get_id(mp_wav_taglists, stream->wf->wFormatTag);
+		ctx->codec_id = mp_tag2codec_id(stream->wf->wFormatTag, 1);
 #if 0 //breaks aac in mov at least
 		ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
 #endif
@@ -219,7 +219,7 @@
 	}
 	else if(stream->type == MUXER_TYPE_VIDEO)
 	{
-		ctx->codec_id = av_codec_get_id(mp_bmp_taglists, stream->bih->biCompression);
+		ctx->codec_id = mp_tag2codec_id(stream->bih->biCompression, 0);
                 if(ctx->codec_id <= 0 || force_fourcc)
                     ctx->codec_tag= stream->bih->biCompression;
 		mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id);