RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-20 14:56:55 +00:00
Code Issues Releases Wiki Activity

Fix mpeg-pes playback

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16315 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rtognimp 2005-08-26 22:53:59 +00:00
parent 9dadabac73
commit 16670aff3a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpdemux/demux_mpg.c
View File

@ -804,7 +804,7 @@ int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
static int demux_mpg_pes_probe(demuxer_t *demuxer) {
demuxer->synced = 3;
return demux_mpg_probe(demuxer);
return (demux_mpg_probe(demuxer) == DEMUXER_TYPE_MPEG_PS) ? DEMUXER_TYPE_MPEG_PES : 0;
}
@ -874,7 +874,7 @@ demuxer_desc_t demuxer_desc_mpeg_pes = {
0, // unsafe autodetect
demux_mpg_pes_probe,
demux_mpg_fill_buffer,
NULL,
demux_mpg_ps_open,
demux_close_mpg,
demux_seek_mpg,
NULL

3
libmpdemux/video.c
View File

@ -47,6 +47,7 @@ enum {
if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) ||
(d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES) ||
(d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_GXF) ||
(d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PES) ||
(d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) ||
(d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TY) ||
(d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
@ -405,6 +406,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
demuxer->file_format==DEMUXER_TYPE_MPEG_GXF ||
demuxer->file_format==DEMUXER_TYPE_MPEG_PES ||
(demuxer->file_format==DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
|| demuxer->file_format==DEMUXER_TYPE_PVA ||
((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
@ -596,6 +598,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
}
if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS ||
demuxer->file_format==DEMUXER_TYPE_MPEG_PES ||
((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) ||
demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
demuxer->file_format==DEMUXER_TYPE_MPEG_TY){