diff options
| -rw-r--r-- | etc/codecs.conf | 3 | ||||
| -rw-r--r-- | libmpdemux/asfheader.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index cc75643214..50bc0fdca6 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -27,6 +27,7 @@ videocodec mpeg12 status working format 0x10000001 ; MPEG-1 format 0x10000002 ; MPEG-2 + fourcc "DVR " driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -48,6 +49,7 @@ videocodec ffmpeg2 status working format 0x10000002 ; MPEG-2 fourcc mpg2 + fourcc "DVR " driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -73,6 +75,7 @@ videocodec ffmpeg12mc format 0x10000001 ; MPEG-1 format 0x10000002 ; MPEG-2 fourcc mpg1,mpg2 + fourcc "DVR " fourcc PIM1 ; Pinnacle hardware-MPEG-1 driver ffmpeg dll "mpegvideo_xvmc" diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 488ef052bd..e180dc006d 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -238,6 +238,9 @@ int read_asf_header(demuxer_t *demuxer){ sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1); memcpy(sh_video->bih,&buffer[4+4+1+2],len); le2me_BITMAPINFOHEADER(sh_video->bih); + if (sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' ')) + mp_msg(MSGT_DEMUXER, MSGL_WARN, "DVR will probably only work with " + "libavformat, try -demuxer 35 if you have problems\n"); //sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; //sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; if(verbose>=1) print_video_header(sh_video->bih); |