1. 17 Dec, 2011 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 552ec4c9
      Michael Niedermayer authored
      * qatar/master:
        get_bits: remove A32 variant
        avconv: support stream specifiers in -metadata and -map_metadata
        wavpack: Fix 32-bit clipping
        wavpack: Clip samples after shifting
        h264: don't drop B-frames after next keyframe on POC reset.
        get_bits: remove useless pointer casts
        configure: refactor lists of tests and components into variables
        rv40: NEON optimised weak loop filter
        mpegts: replace some magic numbers with the existing define
        swscale: add unscaled packed 16 bit per component endianess conversion
      
      Conflicts:
      	libavcodec/get_bits.h
      	libavcodec/h264.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      552ec4c9
  2. 16 Dec, 2011 36 commits
  3. 15 Dec, 2011 3 commits