mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
-LPCM _is_ a private stream. Sorry.
-GetMACAddress takes the interface defined in the environment variable vlc_iface instead of eth0
This commit is contained in:
parent
5a7803e0c5
commit
b70a26fa31
@ -10,7 +10,7 @@
|
||||
* -dvd_udf to find files
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1998-2001 VideoLAN
|
||||
* $Id: input_dvd.c,v 1.94 2001/11/11 18:15:41 sam Exp $
|
||||
* $Id: input_dvd.c,v 1.95 2001/11/12 03:07:13 stef Exp $
|
||||
*
|
||||
* Author: Stéphane Borel <stef@via.ecp.fr>
|
||||
*
|
||||
@ -603,7 +603,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
|
||||
i_id = ( ( 0xa0 + audio_status.i_position ) << 8 ) | 0xbd;
|
||||
p_es = input_AddES( p_input,
|
||||
p_input->stream.pp_programs[0], i_id, 0 );
|
||||
p_es->i_stream_id = i_id;
|
||||
p_es->i_stream_id = 0xbd;
|
||||
p_es->i_type = LPCM_AUDIO_ES;
|
||||
p_es->b_audio = 1;
|
||||
p_es->i_cat = AUDIO_ES;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* mpeg_system.c: TS, PS and PES management
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1998, 1999, 2000 VideoLAN
|
||||
* $Id: mpeg_system.c,v 1.62 2001/11/12 01:56:33 stef Exp $
|
||||
* $Id: mpeg_system.c,v 1.63 2001/11/12 03:07:13 stef Exp $
|
||||
*
|
||||
* Authors: Christophe Massiot <massiot@via.ecp.fr>
|
||||
* Michel Lespinasse <walken@via.ecp.fr>
|
||||
@ -1499,14 +1499,15 @@ static void input_DecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
|
||||
p_new_es->i_cat = VIDEO_ES;
|
||||
input_SelectES( p_input, p_new_es );
|
||||
break;
|
||||
p_new_es->i_stream_id = 0xBD;
|
||||
case MPEG1_AUDIO_ES:
|
||||
case MPEG2_AUDIO_ES:
|
||||
case LPCM_AUDIO_ES :
|
||||
p_new_es->i_cat = AUDIO_ES;
|
||||
i_audio_es += 1;
|
||||
if( i_audio_es == i_required_audio_es )
|
||||
input_SelectES( p_input, p_new_es );
|
||||
break;
|
||||
case LPCM_AUDIO_ES :
|
||||
case AC3_AUDIO_ES :
|
||||
p_new_es->i_stream_id = 0xBD;
|
||||
p_new_es->i_cat = AUDIO_ES;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* netutils.c: various network functions
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1999, 2000, 2001 VideoLAN
|
||||
* $Id: netutils.c,v 1.39 2001/10/10 14:25:15 sam Exp $
|
||||
* $Id: netutils.c,v 1.40 2001/11/12 03:07:13 stef Exp $
|
||||
*
|
||||
* Authors: Vincent Seguin <seguin@via.ecp.fr>
|
||||
* Benoit Steiner <benny@via.ecp.fr>
|
||||
@ -446,7 +446,8 @@ static int GetMacAddress( int i_socket, char *psz_mac )
|
||||
* Looking for information about the eth0 interface
|
||||
*/
|
||||
interface.ifr_addr.sa_family = AF_INET;
|
||||
strcpy( interface.ifr_name, INPUT_IFACE_DEFAULT );
|
||||
strcpy( interface.ifr_name,
|
||||
main_GetPszVariable( INPUT_IFACE_VAR, INPUT_IFACE_DEFAULT ) );
|
||||
|
||||
i_ret = ioctl( i_socket, SIOCGIFHWADDR, &interface );
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user