diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-27 12:39:53 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-27 12:39:53 +0000 |
| commit | cb805dfa54b38e5b6258abce7bcff9e2a5ab1931 (patch) | |
| tree | 4bae19fbee020e8e11991d21de74368d83c26bc2 /libmpdemux | |
| parent | a916b0cf0ee025f8cc0d551c708a4f2b7ca9e90a (diff) | |
| download | mpv-cb805dfa54b38e5b6258abce7bcff9e2a5ab1931.tar.bz2 mpv-cb805dfa54b38e5b6258abce7bcff9e2a5ab1931.tar.xz | |
replaced giant if() with if(pre-calculated variable) (there was even a bug: PS doesn't necessarily contain mpeg12)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24864 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 28d35d86b9..5f62a4a793 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -611,11 +611,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** break; } - 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){ + if(video_codec == VIDEO_MPEG12){ sh_video->pts+=frame_time; |