1. 23 Jul, 2011 1 commit
  2. 22 Jul, 2011 2 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 4095fa90
      Michael Niedermayer authored
      * qatar/master:
        dnxhddec: optimise dnxhd_decode_dct_block()
        rtp: remove disabled code
        eac3enc: use different numbers of blocks per frame to allow higher bitrates
        dnxhd: add regression test for 10-bit
        dnxhd: 10-bit support
        dsputil: update per-arch init funcs for non-h264 high bit depth
        dsputil: template get_pixels() for different bit depths
        dsputil: create 16/32-bit dctcoef versions of some functions
        jfdctint: add 10-bit version
        mov: add clcp type track as Subtitle stream.
        mpeg4: add Mpeg4 Profiles names.
        mpeg4: decode Level Profile for MPEG4 Part 2.
        ffprobe: display bitstream level.
        imgconvert: remove unused glue and xglue macros
      
      Conflicts:
      	libavcodec/dsputil_template.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      4095fa90
    • Nicolas George's avatar
      version.sh: handle shallow clones and snapshots. · 657eac04
      Nicolas George authored
      Shallow clones (--depth X) lack the N tag used to compute
      the revision number: use 'git-YYYY-MM-DD-hhhhhhh' as revision,
      where hhhhhhh is the short git hash.
      
      Snapshots from gitweb do not have git information at all,
      but they have the short git hash in the directory name:
      append it to the release number.
      657eac04
  3. 21 Jul, 2011 31 commits
  4. 20 Jul, 2011 6 commits