summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf9
-rw-r--r--libmpcodecs/vd_ffmpeg.c3
2 files changed, 11 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index abf653bf39..4e4c968abd 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -138,6 +138,15 @@ videocodec ffaasc
dll "aasc"
out BGR24
+videocodec ffloco
+ info "LOCO video decoder"
+ status working
+ fourcc LOCO
+ driver ffmpeg
+ dll "loco"
+ out 422P,YV12,BGR32 query
+ out BGR24 flip,query
+
videocodec ffqtrle
info "QuickTime Animation (RLE)"
status working
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index dc16ad7b8f..e18852b13d 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -335,7 +335,8 @@ static int init(sh_video_t *sh){
sh->format == mmioFOURCC('M','P','4','V') ||
sh->format == mmioFOURCC('F','L','I','C') ||
sh->format == mmioFOURCC('S','N','O','W') ||
- sh->format == mmioFOURCC('a','v','c','1')
+ sh->format == mmioFOURCC('a','v','c','1') ||
+ sh->format == mmioFOURCC('L','O','C','O')
))
{
avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);