diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-21 10:10:07 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-21 10:10:07 +0000 |
| commit | cb47a72a44a7b08dee2b43d2f52b40472dac36af (patch) | |
| tree | d33a5a9e7c15052eb52beb67f000c4b4b045a90d /libmpdemux | |
| parent | 36a3d4ef74e1edb759b2601c3e68e0dc8e25d8d3 (diff) | |
| download | mpv-cb47a72a44a7b08dee2b43d2f52b40472dac36af.tar.bz2 mpv-cb47a72a44a7b08dee2b43d2f52b40472dac36af.tar.xz | |
support -ffourcc with -of lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21978 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer.h | 2 | ||||
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h index 6770e5d85f..aa862f9267 100644 --- a/libmpdemux/muxer.h +++ b/libmpdemux/muxer.h @@ -98,6 +98,8 @@ typedef struct muxbuf_t { 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 --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index f9531a35a8..3067d78417 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -239,7 +239,7 @@ static void fix_parameters(muxer_stream_t *stream) 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; |