ffmpeg/libavformat
Michael Niedermayer 9dcc4c30f9 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: add support for bdver1 and bdver2 CPU types.
  avio: make avio_close NULL the freed buffer
  pixdesc: cosmetics
  proresenc: Don't free a buffer not owned by the codec
  proresenc: Write the full value in one put_bits call
  adpcmenc: Calculate the IMA_QT predictor without overflow
  x86: Add convenience macros to check for CPU extensions and flags
  x86: h264dsp: drop some unnecessary ifdefs around prototype declarations
  mss12: merge decode_pixel() and decode_top_left_pixel()
  mss12: reduce SliceContext size from 1067 to 164 KB
  mss12: move SliceContexts out of the common context into the codec contexts

Conflicts:
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-04 17:04:51 +02:00
..
2012-08-30 05:17:24 +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-08-31 15:20:57 +02:00
2012-08-07 23:57:21 +02:00
2012-08-31 23:27:27 +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-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-08-27 19:06:32 +02:00
2012-08-30 17:56:38 +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-09-01 23:45:32 +02:00
2012-08-07 23:57:21 +02:00
2012-09-03 22:40:41 +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