# HG changeset patch
# User reimar
# Date 1169374207 0
# Node ID 0b4d2b0e8722e4cd3ec75efe9dfa5f1726511414
# Parent  46e5f1a5e30002fe2cf3dcc1ecb9911acb175f1f
support -ffourcc with -of lavf

diff -r 46e5f1a5e300 -r 0b4d2b0e8722 libmpdemux/muxer.h
--- a/libmpdemux/muxer.h	Sat Jan 20 21:57:57 2007 +0000
+++ b/libmpdemux/muxer.h	Sun Jan 21 10:10:07 2007 +0000
@@ -98,6 +98,8 @@
   unsigned int flags;
 } muxbuf_t;
 
+extern char *force_fourcc;
+
 muxer_t *muxer_new_muxer(int type,stream_t *stream);
 #define muxer_new_stream(muxer,a) muxer->cont_new_stream(muxer,a)
 #define muxer_stream_fix_parameters(muxer, a) muxer->fix_stream_parameters(a)
diff -r 46e5f1a5e300 -r 0b4d2b0e8722 libmpdemux/muxer_lavf.c
--- a/libmpdemux/muxer_lavf.c	Sat Jan 20 21:57:57 2007 +0000
+++ b/libmpdemux/muxer_lavf.c	Sun Jan 21 10:10:07 2007 +0000
@@ -239,7 +239,7 @@
 	else if(stream->type == MUXER_TYPE_VIDEO)
 	{
 		ctx->codec_id = codec_get_bmp_id(stream->bih->biCompression);
-                if(ctx->codec_id <= 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);
 		ctx->width = stream->bih->biWidth;