FFmpeg/libavcodec
Michael Niedermayer 9e89bc37ed Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Add support for SWFVerification
  api-example: use new video encoding API.
  x86: avcodec: Appropriately name files containing only init functions
  mpegvideo_mmx_template: drop some commented-out cruft
  libavresample: add mix level normalization option
  w32pthreads: Add missing #includes to make header compile standalone
  rtmp: Gracefully ignore _checkbw errors by tracking them
  rtmp: Do not send _checkbw calls as notifications
  prores: interlaced ProRes encoding

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/proresenc_kostya.c
	libavcodec/w32pthreads.h
	libavcodec/x86/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15 15:55:24 +02:00
..
2012-07-29 22:02:46 +02:00
2012-08-09 00:02:05 +00:00
2012-08-07 03:15:39 +00:00
2012-08-14 18:58:49 +02:00
2012-08-08 01:14:18 +02:00
2012-08-12 15:21:15 -04:00
2012-08-07 23:57:21 +02:00
2012-08-09 11:22:11 +02:00
2012-08-11 05:31:59 +02:00
2012-08-13 04:58:15 +02:00
2012-08-09 10:50:27 +02:00
2012-08-07 22:56:35 +00:00
2012-08-10 15:56:14 +02:00
2012-08-15 05:29:28 +02:00
2012-07-29 22:02:46 +02:00
2012-08-12 05:32:07 +02:00
2012-08-11 05:32:16 +02:00
2012-08-14 21:22:20 +02:00
2012-08-14 18:39:55 +02:00