From b2b12a1022bd7ed80c84961c3e69c6bd47b1fec8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Dec 2012 14:35:27 +0100 Subject: [PATCH] mpegts: rename get_bits64 to get_ts64 Renaming because of name conflict Signed-off-by: Michael Niedermayer --- libavformat/mpegts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index aa7bde5768..167194c808 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -712,7 +712,7 @@ static void new_pes_packet(PESContext *pes, AVPacket *pkt) pes->flags = 0; } -static uint64_t get_bits64(GetBitContext *gb, int bits) +static uint64_t get_ts64(GetBitContext *gb, int bits) { uint64_t ret = 0; @@ -774,9 +774,9 @@ static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf if (sl->inst_bitrate_len) inst_bitrate_flag = get_bits1(&gb); if (dts_flag == 1) - dts = get_bits64(&gb, sl->timestamp_len); + dts = get_ts64(&gb, sl->timestamp_len); if (cts_flag == 1) - cts = get_bits64(&gb, sl->timestamp_len); + cts = get_ts64(&gb, sl->timestamp_len); if (sl->au_len > 0) skip_bits_long(&gb, sl->au_len); if (inst_bitrate_flag) -- 2.11.0