[MPlayer-cvslog] r26328 - trunk/libmpdemux/video.c

[reimar]

Author: reimar
Date: Sat Apr  5 13:09:21 2008
New Revision: 26328

Log:
Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder
and also will create proper files when remuxing into e.g. AVI.


Modified:
   trunk/libmpdemux/video.c

Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	(original)
+++ trunk/libmpdemux/video.c	Sat Apr  5 13:09:21 2008
@@ -81,6 +81,8 @@ static video_codec_t find_video_codec(sh
   else if((fmt == DEMUXER_TYPE_MPEG_PS ||  fmt == DEMUXER_TYPE_MPEG_TS) &&
     (sh_video->format==mmioFOURCC('W', 'V', 'C', '1')))
     return VIDEO_VC1;
+  else if (fmt == DEMUXER_TYPE_ASF && sh_video->bih && sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' '))
+    return VIDEO_MPEG12;
   else
     return VIDEO_OTHER;
 }
@@ -250,6 +252,10 @@ switch(video_codec){
    break;
  }
  case VIDEO_MPEG12: {
+   if (d_video->demuxer->file_format == DEMUXER_TYPE_ASF) { // DVR-MS
+     if(!sh_video->bih) return 0;
+     sh_video->format=sh_video->bih->biCompression;
+   }
 mpeg_header_parser:
    // Find sequence_header first:
    videobuf_len=0; videobuf_code_len=0;