summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-29 23:23:46 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-29 23:23:46 +0000
commit1aaf2bbabcb0e59b81d76576e049d0d810d00d2f (patch)
tree5311ec562ad4090eabb0f01f982def7d93f6f507 /etc
parent5cd42ce387d21bdc6f05c09fba42663e2eafc53d (diff)
downloadmpv-1aaf2bbabcb0e59b81d76576e049d0d810d00d2f.tar.bz2
mpv-1aaf2bbabcb0e59b81d76576e049d0d810d00d2f.tar.xz
Support amr_nb and amr_wb via libavcodec
Add fourcc for H.263 used in 3gp files (s263) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14279 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf15
1 files changed, 15 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 31c744e00b..2d035d831a 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -893,6 +893,7 @@ videocodec ffh263
status working
fourcc H263,U263,h263,X263
fourcc viv1 h263
+ fourcc s263
driver ffmpeg
dll h263
out YV12,I420,IYUV
@@ -2327,6 +2328,20 @@ audiocodec ffdts
driver ffmpeg
dll "dts"
+audiocodec ffamrnb
+ info "AMR Narrowband"
+ status working
+ fourcc samr
+ driver ffmpeg
+ dll "amr_nb"
+
+audiocodec ffamrwb
+ info "AMR Widewband"
+ status working
+ fourcc sawb
+ driver ffmpeg
+ dll "amr_wb"
+
audiocodec voxware
info "VoxWare"
status working