Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 May 2012 20:41:29 +0000 (22:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 May 2012 21:30:42 +0000 (23:30 +0200)
commit015903294ca983f007ab5cae098a54013e77f2f6
tree66838f53dca82964270a1938692489c36e1fb1b0
parent2a793ff2bf2197f36db3bf296668d44915142d03
parent110d0cdc9d1ec414a658f841a3fbefbf6f796d61
Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
  ape: Use unsigned integer maths
  arm: dsputil: fix overreads in put/avg_pixels functions
  h264: K&R formatting cosmetics for header files (part II/II)
  h264: K&R formatting cosmetics for header files (part I/II)
  rtmp: Implement check bandwidth notification.
  rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
  rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
  rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
  cmdutils: Add fallback case to switch in check_stream_specifier().
  sctp: be consistent with socket option level
  configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
  vcr1enc: drop pointless empty encode_init() wrapper function
  vcr1: drop pointless write-only AVCodecContext member from VCR1Context
  vcr1: group encoder code together to save #ifdefs
  vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
  mov: make one comment slightly more specific
  lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX
  lavfi: move audio-related functions to a separate file.
  lavfi: remove some audio-related function from public API.
  ...

Conflicts:
cmdutils.c
libavcodec/h264.h
libavcodec/h264_mvpred.h
libavcodec/vcr1.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
40 files changed:
cmdutils.c
configure
libavcodec/apedec.c
libavcodec/arm/dsputil_neon.S
libavcodec/h264.h
libavcodec/h264_mvpred.h
libavcodec/h264data.h
libavcodec/h264dsp.h
libavcodec/h264pred.h
libavcodec/vcr1.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
libavcodec/x86/rv40dsp.asm
libavfilter/Makefile
libavfilter/af_aconvert.c
libavfilter/af_aformat.c
libavfilter/af_amerge.c
libavfilter/af_anull.c
libavfilter/af_aresample.c
libavfilter/af_ashowinfo.c
libavfilter/af_asplit.c
libavfilter/af_astreamsync.c
libavfilter/af_earwax.c
libavfilter/af_pan.c
libavfilter/af_silencedetect.c
libavfilter/af_volume.c
libavfilter/asrc_aevalsrc.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/audio.h
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavfilter/internal.h
libavfilter/src_buffer.c
libavfilter/src_movie.c
libavfilter/version.h
libavformat/mov.c
libavformat/rtmpproto.c
libavutil/x86/x86util.asm