Commit cb95cab2 authored by Laurent Aimar's avatar Laurent Aimar

* mpeg/system.c, ts.c: added h264 to old TS demuxer.

 * mpeg/h264.c : use greater packet size.
parent 133b6cbe
...@@ -57,7 +57,7 @@ struct demux_sys_t ...@@ -57,7 +57,7 @@ struct demux_sys_t
static int Demux( demux_t * ); static int Demux( demux_t * );
static int Control( demux_t *, int, va_list ); static int Control( demux_t *, int, va_list );
#define H264_PACKET_SIZE 50 #define H264_PACKET_SIZE 2048
/***************************************************************************** /*****************************************************************************
* Open: initializes demux structures * Open: initializes demux structures
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* system.h: MPEG demultiplexing. * system.h: MPEG demultiplexing.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2002 VideoLAN * Copyright (C) 1999-2002 VideoLAN
* $Id: system.h,v 1.14 2004/01/15 22:15:40 gbazin Exp $ * $Id$
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
#define MPEG4_VIDEO_ES 0x10 #define MPEG4_VIDEO_ES 0x10
#define MPEG4_AUDIO_ES 0x11 #define MPEG4_AUDIO_ES 0x11
#define H264_VIDEO_ES 0x1b
#define MPEG2_MOTO_VIDEO_ES 0x80 #define MPEG2_MOTO_VIDEO_ES 0x80
#define A52_AUDIO_ES 0x81 #define A52_AUDIO_ES 0x81
/* These ones might violate the usage : */ /* These ones might violate the usage : */
......
...@@ -1449,6 +1449,10 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input, ...@@ -1449,6 +1449,10 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
i_cat = AUDIO_ES; i_cat = AUDIO_ES;
i_stream_id = 0xfa; i_stream_id = 0xfa;
break; break;
case H264_VIDEO_ES:
i_fourcc = VLC_FOURCC('h','2','6','4');
i_cat = VIDEO_ES;
break;
case MSCODEC_VIDEO_ES: case MSCODEC_VIDEO_ES:
i_fourcc = VLC_FOURCC(0,0,0,0); /* fixed later */ i_fourcc = VLC_FOURCC(0,0,0,0); /* fixed later */
i_cat = VIDEO_ES; i_cat = VIDEO_ES;
......
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