Mercurial > mplayer.hg

comparison libmpdemux/video.c @ 16310:fb95057e370e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support MPEG in GXF container with extension-based detection.
author reimar
date Fri, 26 Aug 2005 17:40:02 +0000
parents 04dd5945fab8
children 6720cdd99559
comparison
equal deleted inserted replaced
16309:aa7829aa8428 16310:fb95057e370e
44 VIDEO_OTHER 44 VIDEO_OTHER
45 } video_codec; 45 } video_codec;
46 46
47 if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) || 47 if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) ||
48 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES) || 48 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES) ||
49 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_GXF) ||
49 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || 50 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) ||
50 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TY) || 51 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TY) ||
51 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) 52 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
52 #ifdef STREAMING_LIVE_DOT_COM 53 #ifdef STREAMING_LIVE_DOT_COM
53 || ((d_video->demuxer->file_format == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer)) 54 || ((d_video->demuxer->file_format == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer))
401 int in_size=0; 402 int in_size=0;
402 403
403 *start=NULL; 404 *start=NULL;
404 405
405 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || 406 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
407 demuxer->file_format==DEMUXER_TYPE_MPEG_GXF ||
406 (demuxer->file_format==DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) 408 (demuxer->file_format==DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
407 || demuxer->file_format==DEMUXER_TYPE_PVA || 409 || demuxer->file_format==DEMUXER_TYPE_PVA ||
408 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) 410 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
409 || demuxer->file_format==DEMUXER_TYPE_MPEG_TY 411 || demuxer->file_format==DEMUXER_TYPE_MPEG_TY
410 #ifdef STREAMING_LIVE_DOT_COM 412 #ifdef STREAMING_LIVE_DOT_COM