Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv30: return AVERROR(EINVAL) instead of EINVAL
  build: add -L flags before existing LDFLAGS
  simple_idct: whitespace cosmetics
  simple_idct: make repeated code a macro
  dsputil: remove huge #if 0 block
  simple_idct: change 10-bit add/put stride from pixels to bytes
  dsputil: allow 9/10-bit functions for non-h264 codecs
  dnxhd: rename some data tables
  dnxhdenc: remove inline from function only called through pointer
  dnxhdenc: whitespace cosmetics
  swscale: mark YUV422P10(LE,BE) as supported for output
  configure: add -xc99 to LDFLAGS for Sun CC
  Remove unused and non-compiling vestigial g729 decoder
  Remove unused code under G729_BITEXACT #ifdef.
  mpegvideo: fix invalid picture unreferencing.
  dsputil: Remove extra blank line at end.
  dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
  simple_idct: add 10-bit version

Conflicts:
	Makefile
	libavcodec/g729data.h
	libavcodec/g729dec.c
	libavcodec/rv30.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 cb23b91,9d6ec3a..f4057c5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,11 -66,8 +24,9 @@@ TOOLS-$(CONFIG_ZLIB) += cws2fw
  
  BASENAMES   = ffmpeg ffplay ffprobe ffserver
  ALLPROGS    = $(BASENAMES:%=%$(EXESUF))
 +ALLPROGS_G  = $(BASENAMES:%=%_g$(EXESUF))
  ALLMANPAGES = $(BASENAMES:%=%.1)
  
- ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
- 
  FFLIBS-$(CONFIG_AVDEVICE) += avdevice
  FFLIBS-$(CONFIG_AVFILTER) += avfilter
  FFLIBS-$(CONFIG_AVFORMAT) += avformat

diff --cc common.mak
index 8daf594,d781ced..b1f62d9
--- 1/common.mak
--- 2/common.mak
+++ b/common.mak
@@@ -5,64 -5,6 +5,66 @@@
  # first so "all" becomes default target
  all: all-yes
  
- LDFLAGS    += $(ALLFFLIBS:%=-Llib%)
 +ifndef SUBDIR
 +
 +ifndef V
 +Q      = @
 +ECHO   = printf "$(1)\t%s\n" $(2)
 +BRIEF  = CC AS YASM AR LD HOSTCC STRIP CP
 +SILENT = DEPCC YASMDEP RM RANLIB
 +MSG    = $@
 +M      = @$(call ECHO,$(TAG),$@);
 +$(foreach VAR,$(BRIEF), \
 +    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
 +$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
 +$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
 +endif
 +
++ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
++
 +# NASM requires -I path terminated with /
 +IFLAGS     := -I. -I$(SRC_PATH)/
 +CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
 +CFLAGS     += $(ECFLAGS)
 +CCFLAGS     = $(CFLAGS)
 +YASMFLAGS  += $(IFLAGS) -Pconfig.asm
 +HOSTCFLAGS += $(IFLAGS)
++LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
 +
 +define COMPILE
 +       $($(1)DEP)
 +       $($(1)) $(CPPFLAGS) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $<
 +endef
 +
 +COMPILE_C = $(call COMPILE,CC)
 +COMPILE_S = $(call COMPILE,AS)
 +
 +%.o: %.c
 +      $(COMPILE_C)
 +
 +%.o: %.S
 +      $(COMPILE_S)
 +
 +%.ho: %.h
 +      $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
 +
 +%.ver: %.v
 +      $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 +
 +%.c %.h: TAG = GEN
 +
 +# Dummy rule to stop make trying to rebuild removed or renamed headers
 +%.h:
 +      @:
 +
 +# Disable suffix rules.  Most of the builtin rules are suffix rules,
 +# so this saves some time on slow systems.
 +.SUFFIXES:
 +
 +# Do not delete intermediate files from chains of implicit rules
 +$(OBJS):
 +endif
 +
  OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)
  
  OBJS      += $(OBJS-yes)

diff --cc configure
Simple merge

diff --cc libavcodec/acelp_pitch_delay.c
Simple merge

diff --cc libavcodec/acelp_vectors.c
Simple merge

diff --cc libavcodec/acelp_vectors.h
Simple merge

diff --cc libavcodec/alpha/dsputil_alpha.c
Simple merge

diff --cc libavcodec/amrnbdec.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_arm.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_armv5te.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_armv6.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_neon.c
Simple merge

diff --cc libavcodec/bfin/dsputil_bfin.c
Simple merge

diff --cc libavcodec/celp_math.c
Simple merge

diff --cc libavcodec/dct-test.c
Simple merge

diff --cc libavcodec/dnxhdenc.c
Simple merge

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/dsputil_template.c
Simple merge

diff --cc libavcodec/lsp.c
Simple merge

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/ppc/dsputil_ppc.c
Simple merge

diff --cc libavcodec/ps2/dsputil_mmi.c
Simple merge

diff --cc libavcodec/sh4/dsputil_sh4.c
Simple merge

diff --cc libavcodec/simple_idct.c
Simple merge

diff --cc libavcodec/simple_idct.h
Simple merge

diff --cc libavcodec/sparc/dsputil_vis.c
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libswscale/utils.c
index 480c5a2,c6abb6b..aa88731
--- 1/libswscale/utils.c
--- 2/libswscale/utils.c
+++ b/libswscale/utils.c
@@@ -182,11 -176,12 +182,13 @@@ int sws_isSupportedInput(enum PixelForm
          || (x)==PIX_FMT_YUV420P9LE    \
          || (x)==PIX_FMT_YUV420P10LE   \
          || (x)==PIX_FMT_YUV420P16LE   \
+         || (x)==PIX_FMT_YUV422P10LE   \
          || (x)==PIX_FMT_YUV422P16LE   \
          || (x)==PIX_FMT_YUV444P16LE   \
 +        || (x)==PIX_FMT_YUV422P10BE   \
          || (x)==PIX_FMT_YUV420P9BE    \
          || (x)==PIX_FMT_YUV420P10BE   \
+         || (x)==PIX_FMT_YUV422P10BE   \
          || (x)==PIX_FMT_YUV420P16BE   \
          || (x)==PIX_FMT_YUV422P16BE   \
          || (x)==PIX_FMT_YUV444P16BE   \