diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-26 17:40:02 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-26 17:40:02 +0000 |
| commit | 655334804b2d2affa165e5f6792b584bcb08c04d (patch) | |
| tree | cccd6f434f863b7edaf9ed7f8fb4d1d1799f178f /libmpdemux/video.c | |
| parent | 99bd39496997d8871e2a61c6dcabb15df7e05ae9 (diff) | |
| download | mpv-655334804b2d2affa165e5f6792b584bcb08c04d.tar.bz2 mpv-655334804b2d2affa165e5f6792b584bcb08c04d.tar.xz | |
support MPEG in GXF container with extension-based detection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16311 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
| -rw-r--r-- | libmpdemux/video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 023159abd6..ba1c673975 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -46,6 +46,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_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))) @@ -403,6 +404,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** *start=NULL; if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || + demuxer->file_format==DEMUXER_TYPE_MPEG_GXF || (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))) |