# HG changeset patch
# User michael
# Date 1138204171 0
# Node ID e6dc1aeaf8a5a98de59874fa682167aa813d80a8
# Parent  99c0caec46773c58e3d3d8cd4e64f0a46f044e91
fix aac in mov/mp4

diff -r 99c0caec4677 -r e6dc1aeaf8a5 libmpdemux/muxer_lavf.c
--- a/libmpdemux/muxer_lavf.c	Wed Jan 25 11:28:19 2006 +0000
+++ b/libmpdemux/muxer_lavf.c	Wed Jan 25 15:49:31 2006 +0000
@@ -190,7 +190,9 @@
 	if(stream->type == MUXER_TYPE_AUDIO)
 	{
 		ctx->codec_id = codec_get_wav_id(stream->wf->wFormatTag); 
+#if 0 //breaks aac in mov at least
 		ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
+#endif
 		mp_msg(MSGT_MUXER, MSGL_INFO, "AUDIO CODEC ID: %x, TAG: %x\n", ctx->codec_id, (uint32_t) ctx->codec_tag);
 		ctx->sample_rate = stream->wf->nSamplesPerSec;
 //                mp_msg(MSGT_MUXER, MSGL_INFO, "stream->h.dwSampleSize: %d\n", stream->h.dwSampleSize);
@@ -217,9 +219,8 @@
 	else if(stream->type == MUXER_TYPE_VIDEO)
 	{
 		ctx->codec_id = codec_get_bmp_id(stream->bih->biCompression);
-#if 0 //breaks mov/mp4
-                ctx->codec_tag= stream->bih->biCompression;
-#endif
+                if(ctx->codec_id <= 0)
+                    ctx->codec_tag= stream->bih->biCompression;
 		mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id);
 		ctx->width = stream->bih->biWidth;
 		ctx->height = stream->bih->biHeight;