summaryrefslogtreecommitdiffstats
path: root/libmpdemux/extension.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/extension.c')
-rw-r--r--libmpdemux/extension.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index 1d2ffb832e..8c4602bab4 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -38,9 +38,6 @@ static struct {
const char *extension;
int demuxer_type;
} extensions_table[] = {
-// { "mpeg", DEMUXER_TYPE_MPEG_PS },
-// { "mpg", DEMUXER_TYPE_MPEG_PS },
-// { "mpe", DEMUXER_TYPE_MPEG_PS },
{ "vob", DEMUXER_TYPE_MPEG_PS },
{ "m2v", DEMUXER_TYPE_MPEG_PS },
{ "avi", DEMUXER_TYPE_AVI },
@@ -58,16 +55,16 @@ static struct {
{ "wav", DEMUXER_TYPE_AUDIO },
{ "flac", DEMUXER_TYPE_AUDIO },
{ "fla", DEMUXER_TYPE_AUDIO },
- { "ogg", DEMUXER_TYPE_OGG },
- { "ogm", DEMUXER_TYPE_OGG },
+ { "ogg", DEMUXER_TYPE_LAVF },
+ { "ogm", DEMUXER_TYPE_LAVF },
// { "pls", DEMUXER_TYPE_PLAYLIST },
// { "m3u", DEMUXER_TYPE_PLAYLIST },
- { "xm", DEMUXER_TYPE_XMMS },
- { "mod", DEMUXER_TYPE_XMMS },
- { "s3m", DEMUXER_TYPE_XMMS },
- { "it", DEMUXER_TYPE_XMMS },
- { "mid", DEMUXER_TYPE_XMMS },
- { "midi", DEMUXER_TYPE_XMMS },
+ { "xm", DEMUXER_TYPE_LAVF },
+ { "mod", DEMUXER_TYPE_LAVF },
+ { "s3m", DEMUXER_TYPE_LAVF },
+ { "it", DEMUXER_TYPE_LAVF },
+ { "mid", DEMUXER_TYPE_LAVF },
+ { "midi", DEMUXER_TYPE_LAVF },
{ "nsv", DEMUXER_TYPE_NSV },
{ "nsa", DEMUXER_TYPE_NSV },
{ "mpc", DEMUXER_TYPE_MPC },
@@ -75,8 +72,8 @@ static struct {
{ "avs", DEMUXER_TYPE_AVS },
#endif
{ "302", DEMUXER_TYPE_LAVF },
- { "264", DEMUXER_TYPE_H264_ES },
- { "26l", DEMUXER_TYPE_H264_ES },
+ { "264", DEMUXER_TYPE_LAVF },
+ { "26l", DEMUXER_TYPE_LAVF },
{ "ac3", DEMUXER_TYPE_LAVF },
{ "ape", DEMUXER_TYPE_LAVF },
{ "apl", DEMUXER_TYPE_LAVF },