diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 17:46:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 18:04:34 +0200 |
| commit | 1c66807636ed8da5cf81d75cc8bb2726c6d6bc21 (patch) | |
| tree | dbb5d2fafe49a56ce5d608c74ae32929c08a4405 /libavcodec/huffman.h | |
| parent | 85c830331c36502144e1cc9cf8aa7bd177e1d79d (diff) | |
| parent | d488c3bcbaf7ddda42597e014deb661a7e9e2112 (diff) | |
Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
* commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112':
configure: support Bitrig OS
yuv2rgb: handle line widths that are not a multiple of 4.
graph2dot: Use the fallback getopt implementation if needed
tools: Include io.h for open/read/write/close if unistd.h doesn't exist
testprogs: Remove unused includes
qt-faststart: Use other seek/tell functions on MSVC than on mingw
ismindex: Include direct.h for _mkdir on windows
sdp: Use static const char arrays instead of pointers to strings
x86: avcodec: Drop silly "_mmx" suffixes from filenames
x86: avcodec: Drop silly "_sse" suffixes from filenames
sdp: Include profile-level-id for H264
utvideoenc: use ff_huff_gen_len_table
huffman: add ff_huff_gen_len_table
cllc: simplify/fix swapped data buffer allocation.
rtpdec_h264: Don't set the pixel format
h264: Check that the codec isn't null before accessing it
audio_frame_queue: Define af_queue_log_state before using it
Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/h264.c
libavcodec/huffman.h
libavcodec/huffyuv.c
libavcodec/utvideoenc.c
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffman.h')
| -rw-r--r-- | libavcodec/huffman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 956ac1fbce..2fdf88d405 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -42,6 +42,6 @@ typedef int (*HuffCmp)(const void *va, const void *vb); int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, Node *nodes, HuffCmp cmp, int flags); -void ff_generate_len_table(uint8_t *dst, const uint64_t *stats); +void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats); #endif /* AVCODEC_HUFFMAN_H */ |