aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
diff options
context:
space:
mode:
authorGravatar compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-24 12:15:31 +0000
committerGravatar compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-24 12:15:31 +0000
commitc191e0424b5e45e3dc46340b2e820603530a6ddb (patch)
tree1b1df061f09739ed610d239b856099a18eefd0d4 /libmpdemux
parent8fc592968a55c84ff88ee95932a37f8ec4c599d1 (diff)
add support for /game-formats/psx-str/
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27133 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/extension.c1
-rw-r--r--libmpdemux/mp_taglists.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index 87cc07cc25..5db36b6f29 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -62,6 +62,7 @@ static struct {
{ "ape", DEMUXER_TYPE_LAVF },
{ "apl", DEMUXER_TYPE_LAVF },
{ "mac", DEMUXER_TYPE_LAVF },
+ { "str", DEMUXER_TYPE_LAVF },
// At least the following are hacks against broken autodetection
// that should not be there
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index a620ef5649..4fcc95d6bd 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -27,6 +27,7 @@ static const AVCodecTag mp_wav_tags[] = {
{ CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},
{ CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')},
{ CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')},
+ { CODEC_ID_ADPCM_XA, MKTAG('P', 'S', 'X', 'A')},
{ CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)},
{ CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')},
{ CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')},
@@ -69,6 +70,7 @@ static const AVCodecTag mp_bmp_tags[] = {
{ CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')},
{ CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')},
{ CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')},
+ { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')},
{ CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')},
{ CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},
{ CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')},