mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
* mux/ts.c : allowed sending mjpeg (who said that's ugly ?)
* demux/ts.c : fixed an endian problem with such private stream.
This commit is contained in:
parent
843ab7adfd
commit
aaaf677b4f
@ -2,7 +2,7 @@
|
||||
* mpeg_ts.c : Transport Stream input module for vlc
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2000-2001 VideoLAN
|
||||
* $Id: ts.c,v 1.24 2003/05/15 22:27:37 massiot Exp $
|
||||
* $Id: ts.c,v 1.25 2003/05/31 00:10:11 fenrir Exp $
|
||||
*
|
||||
* Authors: Henri Fallon <henri@via.ecp.fr>
|
||||
* Johan Bilien <jobi@via.ecp.fr>
|
||||
@ -1532,9 +1532,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
|
||||
if( p_dr && p_dr->i_length >= 8 )
|
||||
{
|
||||
int i_bih_size;
|
||||
i_fourcc = (p_dr->p_data[0] << 24) |
|
||||
(p_dr->p_data[1] << 16) | (p_dr->p_data[2] << 8) |
|
||||
p_dr->p_data[3];
|
||||
i_fourcc = VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1], p_dr->p_data[2], p_dr->p_data[3] );
|
||||
|
||||
i_bih_size = (p_dr->p_data[8] << 8) | p_dr->p_data[9];
|
||||
i_size = sizeof( BITMAPINFOHEADER ) + i_bih_size;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* ts.c
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2001, 2002 VideoLAN
|
||||
* $Id: ts.c,v 1.18 2003/05/14 11:15:50 fenrir Exp $
|
||||
* $Id: ts.c,v 1.19 2003/05/31 00:10:11 fenrir Exp $
|
||||
*
|
||||
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
|
||||
* Eric Petit <titer@videolan.org>
|
||||
@ -260,6 +260,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
|
||||
case VLC_FOURCC( 'D', 'I', 'V', '3' ):
|
||||
case VLC_FOURCC( 'D', 'I', 'V', '2' ):
|
||||
case VLC_FOURCC( 'D', 'I', 'V', '1' ):
|
||||
case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
|
||||
p_stream->i_stream_type = 0xa0; // private
|
||||
p_stream->i_stream_id = 0xa0; // beurk
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user