diff options
author | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-06-12 11:23:22 +0000 |
---|---|---|
committer | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-06-12 11:23:22 +0000 |
commit | 7fbd75845cef0a69a61f148f7d03a101550128a5 (patch) | |
tree | 5b480bd742e2fe331c8d4a1e7153665bc964ab83 | |
parent | 3c2096500391132f448de0ac47fef36c2d879178 (diff) |
sync with ffmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29357 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | etc/codecs.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 606c40c8d2..6ec7ae9be6 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3739,6 +3739,7 @@ audiocodec ulaw status working format 0x7 format 0x77616c75 ; "ulaw" (MOV files) + format 0x6c75 driver alaw audiocodec dvdpcm @@ -3762,6 +3763,7 @@ audiocodec ffac3 format 0x2000 format 0x332D6361 ; ac-3 in mp4 fourcc dnet + fourcc sac3 driver ffmpeg dll ac3 |