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>

diff --cc Makefile
index dd3a1f6,da12fba..1d4e494
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -14,9 -55,7 +14,8 @@@ PROGS-$(CONFIG_FFPROBE)  += ffprob
  PROGS-$(CONFIG_FFSERVER) += ffserver
  
  PROGS      := $(PROGS-yes:%=%$(EXESUF))
 +PROGS_G     = $(PROGS-yes:%=%_g$(EXESUF))
  OBJS        = $(PROGS-yes:%=%.o) cmdutils.o
- TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher))
  TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
  HOSTPROGS  := $(TESTTOOLS:%=tests/%)
  
@@@ -76,12 -110,16 +75,16 @@@ ende
  $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
  
  ffplay.o: CFLAGS += $(SDL_CFLAGS)
 -ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 -ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
 +ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 +ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
  
 -$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
 +%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
  
+ TOOLS     = cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher
+ TOOLOBJS := $(TOOLS:%=tools/%.o)
+ TOOLS    := $(TOOLS:%=tools/%$(EXESUF))
+ 
  alltools: $(TOOLS)
  
  tools/%$(EXESUF): tools/%.o

diff --cc common.mak
Simple merge

diff --cc configure
index 3092248,9cde178..fd4b034
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3202,8 -3124,10 +3196,11 @@@ echo "network support           ${netwo
  echo "threading support         ${thread_type-no}"
  echo "SDL support               ${sdl-no}"
  echo "Sun medialib support      ${mlib-no}"
+ echo "libdxva2 enabled          ${dxva2-no}"
+ echo "libva enabled             ${vaapi-no}"
+ echo "libvdpau enabled          ${vdpau-no}"
  echo "AVISynth enabled          ${avisynth-no}"
 +echo "libcelt enabled           ${libcelt-no}"
  echo "frei0r enabled            ${frei0r-no}"
  echo "libdc1394 support         ${libdc1394-no}"
  echo "libdirac enabled          ${libdirac-no}"
@@@ -3254,34 -3176,8 +3250,10 @@@ echo "License: $license
  
  echo "Creating config.mak and config.h..."
  
- # build tree in object directory if source path is different from current one
- if enabled source_path_used; then
-     DIRS="
-         doc
-         libavcodec
-         libavcodec/$arch
-         libavdevice
-         libavfilter
-         libavfilter/$arch
-         libavfilter/libmpcodecs
-         libavfilter/libmpcodecs/libvo
-         libavformat
-         libavutil
-         libavutil/$arch
-         libpostproc
-         libswscale
-         libswscale/$arch
-         tests
-         tests/fate
-         tools
-     "
- 
-     map 'mkdir -p $v' $DIRS;
-     $ln_s "$source_path/Makefile" .
- fi
+ test -e Makefile || $ln_s "$source_path/Makefile" .
  
 +enabled stripping || strip="echo skipping strip"
 +
  config_files="$TMPH config.mak"
  
  cat > config.mak <<EOF

diff --cc libavcodec/aaccoder.c
Simple merge

diff --cc libavcodec/aacenc.c
Simple merge

diff --cc libavcodec/aacpsy.c
Simple merge

diff --cc libavcodec/arm/dsputil_arm.S
Simple merge

diff --cc libavcodec/psymodel.c
Simple merge

diff --cc libavcodec/psymodel.h
Simple merge

diff --cc libavcodec/utils.c
Simple merge

diff --cc libavformat/matroskadec.c
index 6e951ba,c5f8e67..61fcec2
--- 1/libavformat/matroskadec.c
--- 2/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@@ -1918,9 -1860,11 +1918,9 @@@ static int matroska_parse_cluster(Matro
      res = ebml_parse(matroska, matroska_clusters, &cluster);
      blocks_list = &cluster.blocks;
      blocks = blocks_list->elem;
-     for (i=0; i<blocks_list->nb_elem; i++)
+     for (i=0; i<blocks_list->nb_elem && !res; i++)
          if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
              int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
 -            if (!blocks[i].non_simple)
 -                blocks[i].duration = AV_NOPTS_VALUE;
              res=matroska_parse_block(matroska,
                                       blocks[i].bin.data, blocks[i].bin.size,
                                       blocks[i].bin.pos,  cluster.timecode,

diff --cc libavformat/oggdec.c
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libavutil/pixfmt.h
Simple merge

diff --cc libavutil/rational.c
Simple merge

diff --cc tests/fate2.mak
Simple merge