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>

1 files changed, 2 insertions, 2 deletions

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index e770b6353f..2a9ebe1b2c 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -676,7 +676,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
     }
 
     for (i = 0; i < 3; i++) {
-        ff_generate_len_table(s->len[i], s->stats[i]);
+        ff_huff_gen_len_table(s->len[i], s->stats[i]);
 
         if (generate_bits_table(s->bits[i], s->len[i]) < 0) {
             return -1;
@@ -1286,7 +1286,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     if (s->context) {
         for (i = 0; i < 3; i++) {
-            ff_generate_len_table(s->len[i], s->stats[i]);
+            ff_huff_gen_len_table(s->len[i], s->stats[i]);
             if (generate_bits_table(s->bits[i], s->len[i]) < 0)
                 return -1;
             size += store_table(s, s->len[i], &pkt->data[size]);