Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: remove empty $(OBJS) target
  build: make rule for linking ff* apply only to these targets
  build: rearrange some lines in a more logical way
  s302m: fix resampling for 16 and 24bits.
  ARM: remove MUL64 and MAC64 inline asm
  build: clean up .PHONY lists
  build: move all (un)install* target aliases to toplevel Makefile
  flvenc: propagate error properly
  build: remove stale dependency
  build: do not add CFLAGS-yes to CFLAGS
  utils.c: fix crash with threading enabled.
  configure: simplify source_path setup
  configure: remove --source-path option
  lavf: deprecate AVFormatParameters.time_base.
  img2: add framerate private option.
  img2: add video_size private option.
  img2: add pixel_format private option.
  tty: add framerate private option.

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc Makefile
index 11239ec,db1a9bd..2ac30ef
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -80,12 -74,15 +80,15 @@@ ende
  
  $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
  
 -ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 -ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
+ ffplay.o: CFLAGS += $(SDL_CFLAGS)
 +ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 +ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
  
- %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
 -$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
++$(PROGS): %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
  
+ alltools: $(TOOLS)
+ 
  tools/%$(EXESUF): tools/%.o
        $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
  

diff --cc common.mak
Simple merge

diff --cc configure
index 5a062b9,34c1ed6..0ad22aa
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1190,8 -1183,6 +1189,7 @@@ CMDLINE_SET=
      nm
      pkg_config
      samples
-     source_path
 +    strip
      sysinclude
      sysroot
      target_exec

diff --cc libavcodec/arm/mathops.h
Simple merge

diff --cc libavcodec/s302m.c
Simple merge

diff --cc libavformat/avformat.h
Simple merge

diff --cc libavformat/flvenc.c
Simple merge

diff --cc libavformat/img2.c
index e0d9293,4e82aa3..b6082c6
--- 1/libavformat/img2.c
--- 2/libavformat/img2.c
+++ b/libavformat/img2.c
@@@ -33,8 -38,10 +38,11 @@@ typedef struct 
      int img_number;
      int img_count;
      int is_pipe;
 +    int split_planes;  /**< use independent file for each Y, U, V plane */
      char path[1024];
+     char *pixel_format;     /**< Set by a private option. */
+     char *video_size;       /**< Set by a private option. */
+     char *framerate;        /**< Set by a private option. */
  } VideoData;
  
  typedef struct {

diff --cc libavformat/tty.c
Simple merge