From: Laurent Aimar Date: Tue, 26 Aug 2003 18:01:16 +0000 (+0000) Subject: * transcode: use mp1v/mpgv for mpeg1 and mp2v for mpeg2 video encoding. X-Git-Tag: 0.7.0~1034 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=d1ff1b966ba822063d447a7f1a7e95f667868433;hp=73fadf618fd4aefeb9733570e787e8401f1a6f0f * transcode: use mp1v/mpgv for mpeg1 and mp2v for mpeg2 video encoding. (mpeg2 encoding has been added to vlc) --- diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index 04e9b4f17f..2772883d9a 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -2,7 +2,7 @@ * transcode.c ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: transcode.c,v 1.30 2003/08/11 20:48:19 gbazin Exp $ + * $Id: transcode.c,v 1.31 2003/08/26 18:01:16 fenrir Exp $ * * Authors: Laurent Aimar * @@ -536,8 +536,12 @@ static struct { VLC_FOURCC( 'a', 'l', 'a', 'w' ), CODEC_ID_PCM_ALAW }, /* video */ - { VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 }, { VLC_FOURCC( 'm', 'p', 'g', 'v' ), CODEC_ID_MPEG1VIDEO }, + { VLC_FOURCC( 'm', 'p', '1', 'v' ), CODEC_ID_MPEG1VIDEO }, +#if LIBAVCODEC_BUILD >= 4676 + { VLC_FOURCC( 'm', 'p', '2', 'v' ), CODEC_ID_MPEG2VIDEO }, +#endif + { VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 }, { VLC_FOURCC( 'D', 'I', 'V', '1' ), CODEC_ID_MSMPEG4V1 }, { VLC_FOURCC( 'D', 'I', 'V', '2' ), CODEC_ID_MSMPEG4V2 }, { VLC_FOURCC( 'D', 'I', 'V', '3' ), CODEC_ID_MSMPEG4V3 }, @@ -1215,6 +1219,12 @@ static int transcode_video_ffmpeg_new( sout_stream_t *p_stream, return VLC_EGENERIC; } + if( id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','1','v' )|| + id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','2','v' ) ) + { + id->f_dst.i_fourcc = VLC_FOURCC( 'm','p','g','v' ); + } + id->ff_enc_c = avcodec_alloc_context(); id->ff_enc_c->width = id->f_dst.i_width; id->ff_enc_c->height = id->f_dst.i_height;