Commit 86b811f6 authored by Christophe Massiot's avatar Christophe Massiot
Browse files

* Added 0x80 as MPEG2_MOTO_VIDEO_ES, since some strange Motorola encoders

  do not follow the standard.
parent 915d39ba
......@@ -412,6 +412,7 @@ int SatelliteSetProgram( input_thread_t * p_input,
{
case MPEG1_VIDEO_ES:
case MPEG2_VIDEO_ES:
case MPEG2_MOTO_VIDEO_ES:
if ( input_SelectES( p_input , p_es ) == 0 )
{
ioctl_SetDMXFilter( p_es->i_id, &p_es->i_demux_fd, 1);
......
......@@ -2,7 +2,7 @@
* system.c: helper module for TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: system.c,v 1.11 2003/03/09 23:39:05 jlj Exp $
* $Id: system.c,v 1.12 2003/03/18 23:59:07 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -641,6 +641,7 @@ static void DecodePSM( input_thread_t * p_input, data_packet_t * p_data )
{
case MPEG1_VIDEO_ES:
case MPEG2_VIDEO_ES:
case MPEG2_MOTO_VIDEO_ES:
p_es->i_fourcc = VLC_FOURCC('m','p','g','v');
p_es->i_cat = VIDEO_ES;
break;
......
......@@ -2,7 +2,7 @@
* system.h: MPEG demultiplexing.
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: system.h,v 1.6 2003/02/23 18:07:30 fenrir Exp $
* $Id: system.h,v 1.7 2003/03/18 23:59:07 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -51,6 +51,7 @@
#define MPEG4_VIDEO_ES 0x10
#define MPEG4_AUDIO_ES 0x11
#define MPEG2_MOTO_VIDEO_ES 0x80
#define A52_AUDIO_ES 0x81
/* These ones might violate the usage : */
#define DVD_SPU_ES 0x82
......
......@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: ts.c,v 1.19 2003/02/23 18:07:30 fenrir Exp $
* $Id: ts.c,v 1.20 2003/03/18 23:59:07 massiot Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
......@@ -641,6 +641,7 @@ static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
{
case MPEG1_VIDEO_ES:
case MPEG2_VIDEO_ES:
case MPEG2_MOTO_VIDEO_ES:
/* This isn't real, but we don't actually use
* it. */
p_new_es->i_stream_id = 0xE0;
......@@ -1295,6 +1296,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
{
case MPEG1_VIDEO_ES:
case MPEG2_VIDEO_ES:
case MPEG2_MOTO_VIDEO_ES:
p_new_es->i_fourcc = VLC_FOURCC('m','p','g','v');
p_new_es->i_cat = VIDEO_ES;
break;
......
Supports Markdown
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