summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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')
))
{