summaryrefslogtreecommitdiff
path: root/libavformat/rawenc.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/rawenc.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/rawenc.c')
-rw-r--r--libavformat/rawenc.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 119292d428..5a116b189e 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -107,6 +107,21 @@ AVOutputFormat eac3_muxer = {
};
#endif
+#if CONFIG_G722_MUXER
+AVOutputFormat g722_muxer = {
+ "g722",
+ NULL_IF_CONFIG_SMALL("raw G.722"),
+ "audio/G722",
+ "g722",
+ 0,
+ CODEC_ID_ADPCM_G722,
+ CODEC_ID_NONE,
+ NULL,
+ ff_raw_write_packet,
+ .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif
+
#if CONFIG_H261_MUXER
AVOutputFormat h261_muxer = {
"h261",