• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1a34478b
    Michael Niedermayer authored
    * qatar/master:
      Fix NASM include directive
      dsputil_mmx: Honor HAVE_AMD3DNOW
      lavf,lavd: remove all usage of AVFormatParameters from demuxers.
      jack: add 'channels' private option.
      VC-1: fix reading of custom PAR.
      Remove redundant and dubious video codec detection by its extradata
      mpeg12: remove repeat-field code disabled since May 2002
      patch checklist: suggest fate instead of regression tests
      Turn on resampling on sudden size change instead of bailing out during recode.
      avtools: reinitialise filter chain when input video stream changes dimensions
    
    Conflicts:
    	Makefile
    	avconv.c
    	doc/developer.texi
    	ffplay.c
    	libavcodec/x86/dsputil_mmx.c
    	libavdevice/libdc1394.c
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    1a34478b
common.mak 3.02 KB