summaryrefslogtreecommitdiffstats
path: root/etc/codecs.conf
diff options
context:
space:
mode:
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r--etc/codecs.conf10
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 6a4239b1a4..fe41f3353c 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -700,7 +700,7 @@ videocodec ffwv1f
out YV12,I420,IYUV flip
videocodec xvid
- info "XviD (MPEG-4)"
+ info "Xvid (MPEG-4)"
status working
fourcc FMP4,fmp4
fourcc DIVX,divx
@@ -2265,6 +2265,7 @@ videocodec rawbgr16flip
status working
driver raw
format 0x0
+ format 0x10424752 0x0
out BGR16 flip
videocodec rawbgr16
@@ -2787,6 +2788,13 @@ audiocodec ffadpcmea
driver ffmpeg
dll adpcm_ea
+audiocodec ffadpcmeamaxis
+ info "FFmpeg EA MAXIS XA ADPCM audio"
+ status working
+ fourcc ADXA ; internal MPlayer FourCC
+ driver ffmpeg
+ dll adpcm_ea_maxis_xa
+
audiocodec ffxandpcm
info "FFmpeg XAN DPCM audio"
comment "only works with libavformat demuxer"