[Ffmpeg-cvslog] CVS: ffmpeg/libavformat amr.c,1.10,1.11
Diego Biurrun CVS
diego
Sun Jan 22 14:51:02 CET 2006
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat Makefile, 1.109, 1.110 allformats.c, 1.52, 1.53 avio.c, 1.17, 1.18 aviobuf.c, 1.34, 1.35 ffm.c, 1.50, 1.51
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg configure,1.237,1.238
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv7750/libavformat
Modified Files:
amr.c
Log Message:
Place proper #ifdef around muxer-specific code.
patch by Gianluigi Tiesi < mplayer at at at netfarm dot.dot it >
Index: amr.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/amr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- amr.c 12 Jan 2006 22:43:21 -0000 1.10
+++ amr.c 22 Jan 2006 13:50:59 -0000 1.11
@@ -28,6 +28,7 @@
static const unsigned char AMR_header [] = "#!AMR\n";
static const unsigned char AMRWB_header [] = "#!AMR-WB\n";
+#ifdef CONFIG_MUXERS
static int amr_write_header(AVFormatContext *s)
{
ByteIOContext *pb = &s->pb;
@@ -62,6 +63,7 @@
{
return 0;
}
+#endif /* CONFIG_MUXERS */
static int amr_probe(AVProbeData *p)
{
@@ -223,6 +225,7 @@
amr_read_close,
};
+#ifdef CONFIG_MUXERS
static AVOutputFormat amr_oformat = {
"amr",
"3gpp amr file format",
@@ -235,10 +238,13 @@
amr_write_packet,
amr_write_trailer,
};
+#endif
int amr_init(void)
{
av_register_input_format(&amr_iformat);
+#ifdef CONFIG_MUXERS
av_register_output_format(&amr_oformat);
+#endif
return 0;
}
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat Makefile, 1.109, 1.110 allformats.c, 1.52, 1.53 avio.c, 1.17, 1.18 aviobuf.c, 1.34, 1.35 ffm.c, 1.50, 1.51
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg configure,1.237,1.238
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list