diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-30 14:45:42 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-30 14:45:42 +0000 |
| commit | 4daef48770c3d434aa87d4449e864ad733cb194a (patch) | |
| tree | 47d4eaf93d56205762e24a2dd8edecf678cc8bc3 | |
| parent | 6eaad0c49243d14040b0e478eec734eb73a9cc6c (diff) | |
| download | mpv-4daef48770c3d434aa87d4449e864ad733cb194a.tar.bz2 mpv-4daef48770c3d434aa87d4449e864ad733cb194a.tar.xz | |
ffrv20 decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11542 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index ffb1aded0d..256d93ef1d 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1104,6 +1104,14 @@ videocodec ffrv10 dll rv10 out YV12,I420,IYUV +videocodec ffrv20 + info "FFmpeg RV20 decoder" + status untested + fourcc RV20,rv20 + driver ffmpeg + dll rv20 + out YV12,I420,IYUV + videocodec ffvp3 info "FFmpeg's VP3-Codec" status untested diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index fd3b73d2af..dcd0b16d88 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -251,7 +251,9 @@ static int init(sh_video_t *sh){ #endif } if( sh->format == mmioFOURCC('R', 'V', '1', '0') - || sh->format == mmioFOURCC('R', 'V', '1', '3')){ + || sh->format == mmioFOURCC('R', 'V', '1', '3') + || sh->format == mmioFOURCC('R', 'V', '2', '0') + ){ avctx->extradata_size= 8; avctx->extradata = malloc(avctx->extradata_size); if(sh->bih->biSize!=sizeof(*sh->bih)+8){ @@ -677,7 +679,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ // if(sh->ds->demuxer->type == DEMUXER_TYPE_REAL){ if( sh->format == mmioFOURCC('R', 'V', '1', '0') - || sh->format == mmioFOURCC('R', 'V', '1', '3')) + || sh->format == mmioFOURCC('R', 'V', '1', '3') + || sh->format == mmioFOURCC('R', 'V', '2', '0')) if(sh->bih->biSize==sizeof(*sh->bih)+8){ int i; dp_hdr_t *hdr= (dp_hdr_t*)data; |