Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jun 2011 02:20:53 +0000 (04:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jun 2011 02:32:24 +0000 (04:32 +0200)
commit8c0cbb0848430e4de7182dc2fa2f70262d8c77c7
treed08758ea987f08f1d5a8caf44f082adc5586e815
parent623bf96678d2009d34e88ed7c2b73c00930cebae
parent812f2376eecc19c40a95ade1f7a43b762106e0f7
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
Makefile
common.mak
configure
libavcodec/aaccoder.c
libavcodec/aacenc.c
libavcodec/aacpsy.c
libavcodec/arm/dsputil_arm.S
libavcodec/psymodel.c
libavcodec/psymodel.h
libavcodec/utils.c
libavformat/matroskadec.c
libavformat/oggdec.c
libavformat/utils.c
libavutil/pixfmt.h
libavutil/rational.c
tests/fate2.mak