[MPlayer-cvslog] r21978 - in trunk/libmpdemux: muxer.h muxer_lavf.c

[reimar]

Author: reimar
Date: Sun Jan 21 11:10:07 2007
New Revision: 21978

Modified:
   trunk/libmpdemux/muxer.h
   trunk/libmpdemux/muxer_lavf.c

Log:
support -ffourcc with -of lavf


Modified: trunk/libmpdemux/muxer.h
==============================================================================
--- trunk/libmpdemux/muxer.h	(original)
+++ trunk/libmpdemux/muxer.h	Sun Jan 21 11:10:07 2007
@@ -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)

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	(original)
+++ trunk/libmpdemux/muxer_lavf.c	Sun Jan 21 11:10:07 2007
@@ -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;