• Michael Niedermayer's avatar
    Merge commit 'd488c3bc' · 1c668076
    Michael Niedermayer authored
    * commit 'd488c3bc':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1c668076
motion_est.c 16.1 KB