• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7ae473e8
    Michael Niedermayer authored
    * qatar/master:
      nuv: K&R formatting cosmetics
      build: generalise rules and variable settings for av* programs
      nuv: check RTjpeg header for validity
      Revert "nuv: check per-frame header for validity."
      imc: remove unused field IMCContext.one_div_log2
      imc: fix size of a memset()
      imc: remove empty if() block
      fate: simplify variable setting filter.mak
      lavf: Declare an AVRational struct without a struct literal
    
    Conflicts:
    	Makefile
    	configure
    	libavcodec/nuv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7ae473e8
rtjpeg.h 1.48 KB