• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 01590329
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    01590329
h264.h 28.7 KB