Properly #ifdef muxer-specific parts.

Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org >

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4869 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 8b20f32003107b05a9c4838fc28a2f1fc489898c..bf9aa9104337e60ece2f6cbeeb4c7939a69604ce 100644 (file)
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -24,7 +24,6 @@ typedef struct {
     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 @@ static int mmf_rate(int code)
     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)
 {

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index e37f657a77b1c83b1950f6fee8239437bdb4bb39..fafa0a7f7870fb60490aa1f5c5d3a8245e9b12a8 100644 (file)
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -79,6 +79,7 @@ unsigned int mpegts_crc32(const uint8_t *data, int len)
     return crc;
 }
 
+#ifdef CONFIG_MUXERS
 /*********************************************/
 /* mpegts section writer */
 
@@ -729,3 +730,4 @@ AVOutputFormat mpegts_mux = {
     mpegts_write_packet,
     mpegts_write_end,
 };
+#endif // CONFIG_MUXERS

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 8dfb0b5eba8ed2728e3a6b52a50f1c630381fa99..790f9bd910e4e5e4c15b6d6ff332ab6e9b6f70da 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -394,6 +394,12 @@ static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){
     }
 }
 
+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 @@ static int nut_write_header(AVFormatContext *s)
     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;