mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-06-19 19:03:00 +02:00
Properly #ifdef muxer-specific parts.
Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org > Originally committed as revision 4869 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
committed by
Diego Biurrun
parent
d3ac6ed667
commit
6d276a9e91
+6
-6
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user