diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-09-02 19:22:22 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-09-02 19:22:22 +0000 |
| commit | d8ba059c025dd9ed3e9711cd623f5cc27b27b20a (patch) | |
| tree | 94b900410eb8450d435388314636ec0ff71d5dd6 | |
| parent | 210a768c7afb09d8053c3a01ceeec335fdf2b897 (diff) | |
| download | mpv-d8ba059c025dd9ed3e9711cd623f5cc27b27b20a.tar.bz2 mpv-d8ba059c025dd9ed3e9711cd623f5cc27b27b20a.tar.xz | |
Support D-Cinema audio demuxer and decoder from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16363 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/extension.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 54030cd7bc..5aad77e67c 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2325,6 +2325,13 @@ audiocodec mp3 format 0x2033504D ; "MP3 " (used in .nsv files) driver mp3lib +audiocodec ffpcmdaud + info "D-Cinema audio (FFmpeg)" + status untested + fourcc "daud" + driver ffmpeg + dll "pcm_s24daud" + audiocodec ffwmav1 info "DivX audio v1 (FFmpeg)" status untested diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index cd36cb33d4..d6db6ab41d 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -58,6 +58,7 @@ static struct { { "nut", DEMUXER_TYPE_LAVF }, { "swf", DEMUXER_TYPE_LAVF }, { "flv", DEMUXER_TYPE_LAVF }, + { "302", DEMUXER_TYE_LAVF }, { "264", DEMUXER_TYPE_H264_ES }, { "26l", DEMUXER_TYPE_H264_ES }, { "ac3", DEMUXER_TYPE_LAVF } |