summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-01 08:29:54 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-01 08:29:54 +0000
commitc97aba089910fdc7a8c5e12acddedc0bd341f005 (patch)
tree851a14513d18e8bfdc25437ae9215ff920ef25cb
parent0c079bc2df5a0f9ce18c999e7a0aca6c37388596 (diff)
downloadmpv-c97aba089910fdc7a8c5e12acddedc0bd341f005.tar.bz2
mpv-c97aba089910fdc7a8c5e12acddedc0bd341f005.tar.xz
FFASV2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10775 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf8
-rw-r--r--libmpcodecs/vd_ffmpeg.c1
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index fa86abd319..9b22a406c0 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -304,6 +304,14 @@ videocodec ffasv1
dll asv1
out YV12,I420,IYUV
+videocodec ffasv2
+ info "FFmpeg ASUS V2"
+ status working
+ fourcc ASV2
+ driver ffmpeg
+ dll asv2
+ out YV12,I420,IYUV
+
videocodec ffvcr1
info "FFmpeg ATI VCR1"
status working
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 5ae199cde3..e9f0263545 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -268,6 +268,7 @@ static int init(sh_video_t *sh){
sh->format == mmioFOURCC('H','F','Y','U') ||
sh->format == mmioFOURCC('W','M','V','2') ||
sh->format == mmioFOURCC('A','S','V','1') ||
+ sh->format == mmioFOURCC('A','S','V','2') ||
sh->format == mmioFOURCC('V','S','S','H')
))
{