• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 174df6af
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    174df6af
s302m.c 4.96 KB