aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-28 18:29:42 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-28 18:29:42 +0000
commit60711e959992dbb37a4aea57b77976eee4a8efd4 (patch)
tree079346dff66b59d50477f2f49df5367c2425cd59
parenta0af2fa44537fca98d15c55df6a11d78eb3bf2db (diff)
downloadffmpeg-60711e959992dbb37a4aea57b77976eee4a8efd4.tar.gz
raw GSM demuxer (does not work yet as parser is missing)
Originally committed as revision 13013 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/allformats.c1
-rw-r--r--libavformat/raw.c13
2 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9e47a6f7b4..babcf24482 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -82,6 +82,7 @@ void av_register_all(void)
REGISTER_DEMUXER (FOURXM, fourxm);
REGISTER_MUXER (FRAMECRC, framecrc);
REGISTER_MUXDEMUX (GIF, gif);
+ REGISTER_DEMUXER (GSM, gsm);
REGISTER_MUXDEMUX (GXF, gxf);
REGISTER_MUXDEMUX (H261, h261);
REGISTER_MUXDEMUX (H263, h263);
diff --git a/libavformat/raw.c b/libavformat/raw.c
index 718727e2d9..ac44b845ab 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -496,6 +496,19 @@ AVInputFormat aac_demuxer = {
.value = CODEC_ID_AAC,
};
+AVInputFormat gsm_demuxer = {
+ "gsm",
+ "GSM",
+ 0,
+ NULL,
+ audio_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "gsm",
+ .value = CODEC_ID_GSM,
+};
+
#ifdef CONFIG_ROQ_MUXER
AVOutputFormat roq_muxer =
{