diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-03-16 08:57:36 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-19 12:41:59 +0100 |
| commit | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (patch) | |
| tree | e7c2aefd4766229b73aef86bf3312563f70a658c /libavcodec/bitstream.c | |
| parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) | |
lavc: Replace av_dlog and tprintf with internal macros
Diffstat (limited to 'libavcodec/bitstream.c')
| -rw-r--r-- | libavcodec/bitstream.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index f36997ea40..93047a2b91 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -29,6 +29,7 @@ */ #include "avcodec.h" +#include "internal.h" #include "mathops.h" #include "get_bits.h" #include "put_bits.h" @@ -166,7 +167,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, table_size = 1 << table_nb_bits; table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC); - av_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size); + ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size); if (table_index < 0) return table_index; table = &vlc->table[table_index]; @@ -181,7 +182,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, n = codes[i].bits; code = codes[i].code; symbol = codes[i].symbol; - av_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code); + ff_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code); if (n <= table_nb_bits) { /* no need to add another table */ j = code >> (32 - table_nb_bits); @@ -192,7 +193,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, inc = 1 << n; } for (k = 0; k < nb; k++) { - av_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n); + ff_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n); if (table[j][1] /*bits*/ != 0) { av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); return AVERROR_INVALIDDATA; @@ -222,7 +223,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, subtable_bits = FFMIN(subtable_bits, table_nb_bits); j = (flags & INIT_VLC_LE) ? bitswap_32(code_prefix) >> (32 - table_nb_bits) : code_prefix; table[j][1] = -subtable_bits; - av_dlog(NULL, "%4x: n=%d (subtable)\n", + ff_dlog(NULL, "%4x: n=%d (subtable)\n", j, codes[i].bits + table_nb_bits); index = build_table(vlc, subtable_bits, k-i, codes+i, flags); if (index < 0) @@ -285,7 +286,7 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, vlc->table_size = 0; } - av_dlog(NULL, "build table nb_codes=%d\n", nb_codes); + ff_dlog(NULL, "build table nb_codes=%d\n", nb_codes); buf = av_malloc((nb_codes + 1) * sizeof(VLCcode)); if (!buf) |