Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Aug 2012 13:41:01 +0000 (15:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Aug 2012 13:55:24 +0000 (15:55 +0200)
commit9e89bc37edfcd1b4b0a22c096c6546df4a9d1c0b
treede31fc8aa5b32d28a0143aff2477b4c3ada40318
parentaee7b88cc0675fb668e39e8f4a50f2b1bd9305d4
parent635ac8e1be91e941908f85642e4bbb609e48193f
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>
13 files changed:
doc/examples/decoding_encoding.c
doc/protocols.texi
libavcodec/proresenc_kostya.c
libavcodec/w32pthreads.h
libavcodec/x86/Makefile
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/fft_init.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegvideo_mmx_template.c
libavformat/rtmp.h
libavformat/rtmpproto.c
libavformat/version.h