Mercurial > mplayer.hg
changeset 15572:5d738acd664c
support DVR format
| author | reimar |
|---|---|
| date | Thu, 26 May 2005 11:23:15 +0000 |
| parents | ab43da229a76 |
| children | 5db3dd72c876 |
| files | etc/codecs.conf libmpdemux/asfheader.c |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Wed May 25 23:44:55 2005 +0000 +++ b/etc/codecs.conf Thu May 26 11:23:15 2005 +0000 @@ -27,6 +27,7 @@ status working format 0x10000001 ; MPEG-1 format 0x10000002 ; MPEG-2 + fourcc "DVR " driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -48,6 +49,7 @@ status working format 0x10000002 ; MPEG-2 fourcc mpg2 + fourcc "DVR " driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -73,6 +75,7 @@ format 0x10000001 ; MPEG-1 format 0x10000002 ; MPEG-2 fourcc mpg1,mpg2 + fourcc "DVR " fourcc PIM1 ; Pinnacle hardware-MPEG-1 driver ffmpeg dll "mpegvideo_xvmc"
--- a/libmpdemux/asfheader.c Wed May 25 23:44:55 2005 +0000 +++ b/libmpdemux/asfheader.c Thu May 26 11:23:15 2005 +0000 @@ -238,6 +238,9 @@ 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);