comparison libmpdemux/video.c @ 10687:f8d6f7d59ceb

- initial support for MPEG4 in TS (M4V is working, but not AAC yet) patch by Nico <[e-mail]>

10686:8eb690f0e342

//	goto mpeg_header_parser;
    }
#endif
  break;
 }
 case DEMUXER_TYPE_MPEG4_ES: {
   videobuf_len=0; videobuf_code_len=0;
   mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");fflush(stdout);
   while(1){
      int i=sync_video_packet(d_video);
      if(i<=0x11F) break; // found it!

	    sh_video->frametime=sh_video->frametime*5/4;
	    mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode,sh_video->fps);
	    telecine=1;
	}

  } else if(demuxer->file_format==DEMUXER_TYPE_MPEG4_ES){
      //
        while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
          int i=sync_video_packet(d_video);
          if(!read_video_packet(d_video)) return -1; // EOF
	  if(i==0x1B6) break;

10687:f8d6f7d59ceb

//	goto mpeg_header_parser;
    }
#endif
  break;
 }
 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){
      int i=sync_video_packet(d_video);
      if(i<=0x11F) break; // found it!

	    sh_video->frametime=sh_video->frametime*5/4;
	    mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode,sh_video->fps);
	    telecine=1;
	}

  } 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);
          if(!read_video_packet(d_video)) return -1; // EOF
	  if(i==0x1B6) break;