summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf7
-rw-r--r--libmpdemux/extension.c1
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 }