1. 30 Jun, 2011 2 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 8c0cbb08
      Michael Niedermayer authored
      * qatar/master:
        rational-test: Add proper main() declaration to fix gcc warnings.
        configure: Add vdpau and dxva2 to configure results output.
        Remove unused, never built libavutil/pca.[ch]
        matroskadec: forward parsing errors to caller.
        av_find_stream_info: simplify EAGAIN handling.
        aacenc: Fix determination of Mid/Side Mode.
        psymodel: Remove the single channel analysis function
        aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.
        psymodel: Add channels and channel groups to the psymodel.
        ARM: remove check for PLD instruction
        fate: move amr[nw]b test rules into separate files
        ogg: fix double free when finding length of small chained oggs.
        swscale: implement >8bit scaling support.
        build: fix creation of tools dir with make 3.81
        build: Mark all-yes Makefile target as phony.
        pixfmt: fix YUV422/444 wrong endian comment
        build: create output directories as needed
        Add new yuv444 pixfmts to avcodec_align_dimensions2
      
      Conflicts:
      	Makefile
      	configure
      	libavutil/pca.c
      	libavutil/pca.h
      	libavutil/pixfmt.h
      	libswscale/swscale.c
      	libswscale/utils.c
      	libswscale/x86/swscale_template.c
      	tests/ref/lavfi/pixdesc
      	tests/ref/lavfi/pixfmts_copy
      	tests/ref/lavfi/pixfmts_null
      	tests/ref/lavfi/pixfmts_scale
      	tests/ref/lavfi/pixfmts_vflip
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      8c0cbb08
    • Michael Niedermayer's avatar
      623bf966
  2. 29 Jun, 2011 23 commits
  3. 28 Jun, 2011 15 commits