Skip to content

V
vlc-2-2
Commit 81ae0002 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* transcode: keep the group information.

parent e03531a8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/stream_out/transcode.c
View file @ 81ae0002
...@@ -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.68 2004/01/17 12:11:58 gbazin Exp $ * $Id: transcode.c,v 1.69 2004/01/19 14:40:25 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -373,8 +373,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -373,8 +373,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) ); memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
/* create dst format */ /* create dst format */
id->f_dst.i_cat = AUDIO_ES; es_format_Init( &id->f_dst, AUDIO_ES, p_sys->i_acodec );
id->f_dst.i_codec = p_sys->i_acodec; id->f_dst.i_group = id->f_src->i_group;
id->f_dst.audio.i_rate = p_sys->i_sample_rate > 0 ? p_sys->i_sample_rate : id->f_src.audio.i_rate; id->f_dst.audio.i_rate = p_sys->i_sample_rate > 0 ? p_sys->i_sample_rate : id->f_src.audio.i_rate;
id->f_dst.audio.i_channels = p_sys->i_channels > 0 ? p_sys->i_channels : id->f_src.audio.i_channels; id->f_dst.audio.i_channels = p_sys->i_channels > 0 ? p_sys->i_channels : id->f_src.audio.i_channels;
id->f_dst.i_bitrate = p_sys->i_abitrate > 0 ? p_sys->i_abitrate : 64000; id->f_dst.i_bitrate = p_sys->i_abitrate > 0 ? p_sys->i_abitrate : 64000;
...@@ -410,8 +410,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -410,8 +410,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) ); memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
/* create dst format */ /* create dst format */
id->f_dst.i_cat = VIDEO_ES; es_format_Init( &id->f_dst, VIDEO_ES, p_sys->i_vcodec );
id->f_dst.i_codec = p_sys->i_vcodec; id->f_dst.i_group = id->f_src->i_group;
id->f_dst.video.i_width = p_sys->i_width; id->f_dst.video.i_width = p_sys->i_width;
id->f_dst.video.i_height= p_sys->i_height; id->f_dst.video.i_height= p_sys->i_height;
id->f_dst.i_bitrate = p_sys->i_vbitrate > 0 ? p_sys->i_vbitrate : 800*1000; id->f_dst.i_bitrate = p_sys->i_vbitrate > 0 ? p_sys->i_vbitrate : 800*1000;
......
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