Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Aug 2012 15:46:10 +0000 (17:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Aug 2012 16:04:34 +0000 (18:04 +0200)
commit1c66807636ed8da5cf81d75cc8bb2726c6d6bc21
treedbb5d2fafe49a56ce5d608c74ae32929c08a4405
parent85c830331c36502144e1cc9cf8aa7bd177e1d79d
parentd488c3bcbaf7ddda42597e014deb661a7e9e2112
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>
28 files changed:
configure
libavcodec/audio_frame_queue.c
libavcodec/huffman.c
libavcodec/huffman.h
libavcodec/huffyuv.c
libavcodec/motion-test.c
libavcodec/utvideoenc.c
libavcodec/x86/Makefile
libavcodec/x86/cavsdsp.c
libavcodec/x86/dct32.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/fdct.c
libavcodec/x86/fft.asm
libavcodec/x86/h264_qpel.c
libavcodec/x86/imdct36.asm
libavcodec/x86/lpc.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/simple_idct.c
libavcodec/x86/snowdsp.c
libavformat/rtpdec_h264.c
libavformat/sdp.c
libswscale/colorspace-test.c
libswscale/yuv2rgb.c
tools/graph2dot.c
tools/ismindex.c
tools/pktdumper.c
tools/qt-faststart.c