• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7333798c
    Michael Niedermayer authored
    * qatar/master:
      libopenjpeg: support YUV and deep RGB pixel formats
      Fix typo in v410 decoder.
      vf_yadif: unset cur_buf on the input link.
      vf_overlay: ensure the overlay frame does not get leaked.
      vf_overlay: prevent premature freeing of cur_buf
      Support urlencoded http authentication credentials
      rtmp: Return an error when the client bandwidth is incorrect
      rtmp: Return proper error code in handle_server_bw
      rtmp: Return proper error code in handle_client_bw
      rtmp: Return proper error codes in handle_chunk_size
      lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt()
      vp8: Replace x*155/100 by x*101581>>16.
      vp3: don't use calls to inline asm in yasm code.
      x86/dsputil: put inline asm under HAVE_INLINE_ASM.
      dsputil_mmx: fix incorrect assembly code
      rtmp: Factorize the code by adding handle_invoke
      rtmp: Factorize the code by adding handle_chunk_size
      rtmp: Factorize the code by adding handle_ping
      rtmp: Factorize the code by adding handle_client_bw
      rtmp: Factorize the code by adding handle_server_bw
    
    Conflicts:
    	libavcodec/libopenjpegdec.c
    	libavcodec/x86/dsputil_mmx.c
    	libavfilter/vf_overlay.c
    	libavformat/Makefile
    	libavformat/version.h
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    7333798c