diff options
| author |  rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-26 22:53:59 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-26 22:53:59 +0000 |
| commit | 16670aff3afa53a6e8105816532420f07eff0d7c (patch) | |
| tree | 79601213146162c2e4b4645e5260d023eecf30ac /libmpdemux | |
| parent | 9dadabac7355c308b72646b3e1255bcd973ca722 (diff) | |
Fix mpeg-pes playback
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16315 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 4 | ||||
| -rw-r--r-- | libmpdemux/video.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index ea2d090c52..fff4aa417f 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -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 diff --git a/libmpdemux/video.c b/libmpdemux/video.c index ba1c673975..39a0383214 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -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){ |