Mercurial > mplayer.hg
changeset 21960:0b4d2b0e8722
support -ffourcc with -of lavf
| author | reimar |
|---|---|
| date | Sun, 21 Jan 2007 10:10:07 +0000 |
| parents | 46e5f1a5e300 |
| children | 1e0bbd27136d |
| files | libmpdemux/muxer.h libmpdemux/muxer_lavf.c |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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;