• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 29582df7
    Michael Niedermayer authored
    * qatar/master:
      vble: remove vble_error_close
      VBLE Decoder
      tta: use an integer instead of a pointer to iterate output samples
      shorten: do not modify samples pointer when interleaving
      mpc7: only support stereo input.
      dpcm: do not try to decode empty packets
      dpcm: remove unneeded buf_size==0 check.
      twinvq: add SSE/AVX optimized sum/difference stereo interleaving
      vqf/twinvq: pass vqf COMM chunk info in extradata
      vqf: do not set bits_per_coded_sample for TwinVQ.
      twinvq: check for allocation failure in init_mdct_win()
      swscale: add padding to conversion buffer.
      rtpdec: Simplify finalize_packet
      http: Handle proxy authentication
      http: Print an error message for Authorization Required, too
      AVOptions: don't return an invalid option when option list is empty
      AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavcodec/tta.c
    	libavcodec/vble.c
    	libavcodec/version.h
    	libavutil/opt.c
    	libswscale/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    29582df7
shorten.c 18.6 KB