Files
ffmpeg/libavformat
Michael Niedermayer 1c66807636 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>
2012-08-29 18:04:34 +02:00
..
2012-08-28 03:18:21 +02:00
2012-08-14 16:54:25 +02:00
2012-08-14 03:21:08 +02:00
2012-08-18 17:45:58 +02:00
2011-12-19 11:57:34 +01:00
2012-08-29 00:05:03 +02:00
2012-03-03 04:30:49 +01:00
2012-08-07 23:57:21 +02:00
2012-08-16 04:25:07 +02:00
2012-08-18 05:02:58 +02:00
2012-08-21 01:52:55 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-08-14 16:54:25 +02:00
2012-08-10 16:26:39 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-08-14 16:54:25 +02:00
2012-08-27 19:06:32 +02:00
2012-08-27 05:23:42 +02:00
2012-08-26 22:15:20 +02:00
2012-08-26 22:15:21 +02:00
2012-07-20 11:16:52 +02:00
2012-08-25 20:21:52 +02:00
2012-08-07 23:57:21 +02:00
2012-08-28 22:29:20 +02:00
2012-07-25 20:31:16 +03:00
2012-08-29 00:28:07 +02:00
2012-08-29 00:05:03 +02:00
2012-08-07 23:57:21 +02:00