1. 23 Apr, 2012 18 commits
  2. 22 Apr, 2012 21 commits
  3. 21 Apr, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · c047afb8
      Michael Niedermayer authored
      * qatar/master:
        avcodec: remove AVCodecContext.dsp_mask
        avconv: fix a segfault when default encoder for a format doesn't exist.
        utvideo: general cosmetics
        aac: Handle HE-AACv2 when sniffing a channel order.
        movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
        xxan: Remove write-only variable in xan_decode_frame_type0().
        ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().
      
      Conflicts:
      	ffmpeg.c
      	libavcodec/utvideo.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      c047afb8