[Ffmpeg-cvslog] CVS: ffmpeg/libavformat nut.c, 1.60, 1.61 mpegtsenc.c, 1.12, 1.13 mmf.c, 1.6, 1.7

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv5407

Modified Files:
	nut.c mpegtsenc.c mmf.c 
Log Message:
Properly #ifdef muxer-specific parts.
Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org >


Index: nut.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/nut.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- nut.c	12 Jan 2006 22:43:24 -0000	1.60
+++ nut.c	19 Jan 2006 22:30:37 -0000	1.61
@@ -394,6 +394,12 @@
     }
 }
 
+static int64_t lsb2full(StreamContext *stream, int64_t lsb){
+    int64_t mask = (1<<stream->msb_timestamp_shift)-1;
+    int64_t delta= stream->last_pts - mask/2;
+    return  ((lsb - delta)&mask) + delta;
+}
+
 #ifdef CONFIG_MUXERS
 
 static void put_v(ByteIOContext *bc, uint64_t val)
@@ -690,12 +696,6 @@
     return 0;
 }
 
-static int64_t lsb2full(StreamContext *stream, int64_t lsb){
-    int64_t mask = (1<<stream->msb_timestamp_shift)-1;
-    int64_t delta= stream->last_pts - mask/2;
-    return  ((lsb - delta)&mask) + delta;
-}
-
 static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     NUTContext *nut = s->priv_data;

Index: mpegtsenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpegtsenc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mpegtsenc.c	12 Jan 2006 22:43:24 -0000	1.12
+++ mpegtsenc.c	19 Jan 2006 22:30:37 -0000	1.13
@@ -79,6 +79,7 @@
     return crc;
 }
 
+#ifdef CONFIG_MUXERS
 /*********************************************/
 /* mpegts section writer */
 
@@ -729,3 +730,4 @@
     mpegts_write_packet,
     mpegts_write_end,
 };
+#endif // CONFIG_MUXERS

Index: mmf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mmf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mmf.c	12 Jan 2006 22:43:23 -0000	1.6
+++ mmf.c	19 Jan 2006 22:30:37 -0000	1.7
@@ -24,7 +24,6 @@
     offset_t data_size;
 } MMFContext;
 
-#ifdef CONFIG_MUXERS
 static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
 
 static int mmf_rate_code(int rate)
@@ -43,6 +42,7 @@
     return mmf_rates[code];
 }
 
+#ifdef CONFIG_MUXERS
 /* Copy of end_tag() from avienc.c, but for big-endian chunk size */
 static void end_tag_be(ByteIOContext *pb, offset_t start)
 {