Michael Niedermayer 7ae473e8a0 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>
2012-08-06 22:22:37 +02:00
..
2012-07-17 17:09:19 +02:00
2012-07-10 00:04:23 +00:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +00:00
2012-05-09 14:13:34 +01:00
2012-07-08 13:41:39 +02:00
2012-05-09 14:13:34 +01:00
2012-07-23 22:12:12 +02:00
2012-07-10 00:04:23 +00:00
2012-06-18 11:47:08 +01:00