RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-05 23:00:02 +00:00
Code Issues Projects Releases Wiki Activity

mpegts: rename get_bits64 to get_ts64

Browse Source 
Renaming because of name conflict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-08 14:35:27 +01:00
parent aba1a48cc5
commit b2b12a1022
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mpegts.c
View File

@ -712,7 +712,7 @@ static void new_pes_packet(PESContext *pes, AVPacket *pkt)
pes->flags = 0; 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; 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) if (sl->inst_bitrate_len)
inst_bitrate_flag = get_bits1(&gb); inst_bitrate_flag = get_bits1(&gb);
if (dts_flag == 1) if (dts_flag == 1)
dts = get_bits64(&gb, sl->timestamp_len); dts = get_ts64(&gb, sl->timestamp_len);
if (cts_flag == 1) if (cts_flag == 1)
cts = get_bits64(&gb, sl->timestamp_len); cts = get_ts64(&gb, sl->timestamp_len);
if (sl->au_len > 0) if (sl->au_len > 0)
skip_bits_long(&gb, sl->au_len); skip_bits_long(&gb, sl->au_len);
if (inst_bitrate_flag) if (inst_bitrate_flag)