aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rawdec.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-09-09 19:27:41 +0000
committerMartin Storsjö <martin@martin.st>2010-09-09 19:27:41 +0000
commit9013560f13308642a00e6dab038b3cb5d820a81e (patch)
tree7c436cad32b762b2c201edff42a3108ac855d5d9 /libavformat/rawdec.c
parent58e37eafce10bbcf10b111cafb7ba8586c76ef4b (diff)
downloadffmpeg-9013560f13308642a00e6dab038b3cb5d820a81e.tar.gz
Add a muxer and demuxer for raw G.722
Originally committed as revision 25087 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rawdec.c')
-rw-r--r--libavformat/rawdec.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index e093969414..fe25014950 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -137,6 +137,20 @@ int ff_raw_video_read_header(AVFormatContext *s,
/* Note: Do not forget to add new entries to the Makefile as well. */
+#if CONFIG_G722_DEMUXER
+AVInputFormat g722_demuxer = {
+ "g722",
+ NULL_IF_CONFIG_SMALL("raw G.722"),
+ 0,
+ NULL,
+ ff_raw_read_header,
+ ff_raw_read_partial_packet,
+ .flags= AVFMT_GENERIC_INDEX,
+ .extensions = "g722,722",
+ .value = CODEC_ID_ADPCM_G722,
+};
+#endif
+
#if CONFIG_GSM_DEMUXER
AVInputFormat gsm_demuxer = {
"gsm",