Commit bd7ed3ce authored by Gildas Bazin's avatar Gildas Bazin

* modules/packetizer/copy.c, modules/stream_out/transcode.c: added SVQ3 fourcc so we can transcode SVQ3. Small bug fix as well.
parent 5afb7baa
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* copy.c * copy.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: copy.c,v 1.9 2003/05/03 01:12:13 fenrir Exp $ * $Id: copy.c,v 1.10 2003/05/16 23:02:37 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -244,6 +244,10 @@ static int InitThread( packetizer_thread_t *p_pack ) ...@@ -244,6 +244,10 @@ static int InitThread( packetizer_thread_t *p_pack )
p_pack->output_format.i_fourcc = VLC_FOURCC( 'S', 'V', 'Q', '1' ); p_pack->output_format.i_fourcc = VLC_FOURCC( 'S', 'V', 'Q', '1' );
p_pack->output_format.i_cat = VIDEO_ES; p_pack->output_format.i_cat = VIDEO_ES;
break; break;
case VLC_FOURCC( 'S', 'V', 'Q', '3' ):
p_pack->output_format.i_fourcc = VLC_FOURCC( 'S', 'V', 'Q', '3' );
p_pack->output_format.i_cat = VIDEO_ES;
break;
case VLC_FOURCC( 'I', '4', '2', '0' ): case VLC_FOURCC( 'I', '4', '2', '0' ):
p_pack->output_format.i_fourcc = VLC_FOURCC( 'I', '4', '2', '0' ); p_pack->output_format.i_fourcc = VLC_FOURCC( 'I', '4', '2', '0' );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* transcode.c * transcode.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: transcode.c,v 1.15 2003/05/04 18:51:34 fenrir Exp $ * $Id: transcode.c,v 1.16 2003/05/16 23:02:37 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -310,6 +310,7 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f ...@@ -310,6 +310,7 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f
id = malloc( sizeof( sout_stream_id_t ) ); id = malloc( sizeof( sout_stream_id_t ) );
id->i_dts = 0; id->i_dts = 0;
id->id = NULL;
if( p_fmt->i_cat == AUDIO_ES && p_sys->i_acodec != 0 ) if( p_fmt->i_cat == AUDIO_ES && p_sys->i_acodec != 0 )
{ {
msg_Dbg( p_stream, msg_Dbg( p_stream,
...@@ -405,7 +406,7 @@ static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id ) ...@@ -405,7 +406,7 @@ static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id )
} }
} }
p_sys->p_out->pf_del( p_sys->p_out, id->id ); if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
free( id ); free( id );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -476,6 +477,7 @@ static struct ...@@ -476,6 +477,7 @@ static struct
{ VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB }, { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB },
{ VLC_FOURCC( 'd', 'v', 's', 'l' ), CODEC_ID_DVVIDEO }, { VLC_FOURCC( 'd', 'v', 's', 'l' ), CODEC_ID_DVVIDEO },
{ VLC_FOURCC( 'S', 'V', 'Q', '1' ), CODEC_ID_SVQ1 }, { VLC_FOURCC( 'S', 'V', 'Q', '1' ), CODEC_ID_SVQ1 },
{ VLC_FOURCC( 'S', 'V', 'Q', '3' ), CODEC_ID_SVQ3 },
/* raw video code, only used for 'encoding' */ /* raw video code, only used for 'encoding' */
{ VLC_FOURCC( 'I', '4', '2', '0' ), CODEC_ID_RAWVIDEO }, { VLC_FOURCC( 'I', '4', '2', '0' ), CODEC_ID_RAWVIDEO },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment