summaryrefslogtreecommitdiffstats
path: root/libmpdemux/video.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-24 18:08:54 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-24 18:08:54 +0000
commit38f4f0b4cf9858c4bb7806a67ea7ae60c2db25b1 (patch)
treead268d937296552e6a15f970d916d2ff962d8527 /libmpdemux/video.c
parent511946aa0a3fc4afce0379e0ae5d5a8d2eba1754 (diff)
downloadmpv-38f4f0b4cf9858c4bb7806a67ea7ae60c2db25b1.tar.bz2
mpv-38f4f0b4cf9858c4bb7806a67ea7ae60c2db25b1.tar.xz
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
patch by Nico <nsabbi@libero.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10688 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r--libmpdemux/video.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 3bc3528208..22e0123aa4 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -86,7 +86,8 @@ switch(d_video->demuxer->file_format){
#endif
break;
}
- case DEMUXER_TYPE_MPEG4_ES: {
+ case DEMUXER_TYPE_MPEG4_ES:
+ case DEMUXER_TYPE_MPEG4_IN_TS: {
videobuf_len=0; videobuf_code_len=0;
mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");fflush(stdout);
while(1){
@@ -410,7 +411,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
telecine=1;
}
- } else if(demuxer->file_format==DEMUXER_TYPE_MPEG4_ES){
+ } else if((demuxer->file_format==DEMUXER_TYPE_MPEG4_ES) || (demuxer->file_format==DEMUXER_TYPE_MPEG4_IN_TS)){
//
while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
int i=sync_video_packet(d_video);