• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · afc0a24d
    Michael Niedermayer authored
    * qatar/master:
      avcodec: add support for planar signed 8-bit PCM.
      ra144enc: add sample_fmts list to ff_ra_144_encoder
      smackaud: use uint8_t* for 8-bit output buffer type
      smackaud: clip output samples
      smackaud: use sign_extend() for difference value instead of casting
      sipr: use a function pointer to select the decode_frame function
      sipr: set mode based on block_align instead of bit_rate
      sipr: do not needlessly set *data_size to 0 when returning an error
      ra288: fix formatting of LOCAL_ALIGNED_16
      udp: Allow specifying the local IP address
      VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
      vc1dec: move an if() block.
      vc1dec: use correct hybrid prediction threshold.
      vc1dec: Partial rewrite of vc1_pred_mv()
      vc1dec: take ME precision into account while scaling MV predictors.
      lavf: don't leak corrupted packets
    
    Conflicts:
    	libavcodec/8svx.c
    	libavcodec/ra288.c
    	libavcodec/version.h
    	libavformat/iff.c
    	libavformat/udp.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    afc0a24d
sipr.c 18.2 KB