Mercurial > libavcodec.hg
comparison bitstream.c @ 4577:88cf097ebe75 libavcodec
av_realloc_static() is an internal function and therefore should use the ff_ prefix instead of av_.
author | takis |
---|---|
date | Fri, 23 Feb 2007 00:20:39 +0000 |
parents | ad02fe65f45a |
children | aab60ff3d468 |
comparison
equal
deleted
inserted
replaced
4576:ad02fe65f45a | 4577:88cf097ebe75 |
---|---|
35 * | 35 * |
36 * @param[in] ptr The block of memory to reallocate. | 36 * @param[in] ptr The block of memory to reallocate. |
37 * @param[in] size The requested size. | 37 * @param[in] size The requested size. |
38 * @return Block of memory of requested size. | 38 * @return Block of memory of requested size. |
39 */ | 39 */ |
40 void *av_realloc_static(void *ptr, unsigned int size); | 40 void *ff_realloc_static(void *ptr, unsigned int size); |
41 | 41 |
42 void align_put_bits(PutBitContext *s) | 42 void align_put_bits(PutBitContext *s) |
43 { | 43 { |
44 #ifdef ALT_BITSTREAM_WRITER | 44 #ifdef ALT_BITSTREAM_WRITER |
45 put_bits(s,( - s->index) & 7,0); | 45 put_bits(s,( - s->index) & 7,0); |
85 index = vlc->table_size; | 85 index = vlc->table_size; |
86 vlc->table_size += size; | 86 vlc->table_size += size; |
87 if (vlc->table_size > vlc->table_allocated) { | 87 if (vlc->table_size > vlc->table_allocated) { |
88 vlc->table_allocated += (1 << vlc->bits); | 88 vlc->table_allocated += (1 << vlc->bits); |
89 if(use_static) | 89 if(use_static) |
90 vlc->table = av_realloc_static(vlc->table, | 90 vlc->table = ff_realloc_static(vlc->table, |
91 sizeof(VLC_TYPE) * 2 * vlc->table_allocated); | 91 sizeof(VLC_TYPE) * 2 * vlc->table_allocated); |
92 else | 92 else |
93 vlc->table = av_realloc(vlc->table, | 93 vlc->table = av_realloc(vlc->table, |
94 sizeof(VLC_TYPE) * 2 * vlc->table_allocated); | 94 sizeof(VLC_TYPE) * 2 * vlc->table_allocated); |
95 if (!vlc->table) | 95 if (!vlc->table) |