Mercurial > libavformat.hg
changeset 902:5d1bcf01ce28 libavformat
Properly #ifdef muxer-specific parts.
Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org >
| author | diego |
|---|---|
| date | Thu, 19 Jan 2006 22:30:37 +0000 |
| parents | c1a07d63a66d |
| children | 68bc3ca12e79 |
| files | mmf.c mpegtsenc.c nut.c |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mmf.c Thu Jan 19 00:54:10 2006 +0000 +++ b/mmf.c Thu Jan 19 22:30:37 2006 +0000 @@ -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) {
--- a/mpegtsenc.c Thu Jan 19 00:54:10 2006 +0000 +++ b/mpegtsenc.c Thu Jan 19 22:30:37 2006 +0000 @@ -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
--- a/nut.c Thu Jan 19 00:54:10 2006 +0000 +++ b/nut.c Thu Jan 19 22:30:37 2006 +0000 @@ -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;