diff options
Diffstat (limited to 'libmpdemux/video.c')
| -rw-r--r-- | libmpdemux/video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 6ff8210564..2add84c561 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -75,7 +75,7 @@ if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) || ((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000005)) ) video_codec = VIDEO_H264; - else if((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) + else if((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS || d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) video_codec = VIDEO_VC1; else video_codec = VIDEO_OTHER; @@ -613,7 +613,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** *start=videobuffer; in_size=videobuf_len; videobuf_len=0; - } else if((demuxer->file_format==DEMUXER_TYPE_MPEG_PS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) { + } else if((demuxer->file_format==DEMUXER_TYPE_MPEG_PS || demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) { while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE) { int i=sync_video_packet(d_video); if(!i) return -1; |