Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Aug 2012 20:14:43 +0000 (22:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Aug 2012 20:22:37 +0000 (22:22 +0200)
commit7ae473e8a04f686bbeda75c40167c2df4211e662
tree073415316c09d2c86fcd41640f0bab7fddc8c4ed
parenta80ce390df38b30f70012c9ce059129516664805
parentcf22705e87b6f5015b5cbbf60b6ce9b818eb1900
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
Makefile
configure
libavcodec/imc.c
libavcodec/nuv.c
libavcodec/rtjpeg.h
libavformat/utils.c
tests/fate/filter.mak