ffmpeg/libavformat
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-08-06 00:08:53 +02:00
2012-07-29 01:28:12 +00:00
2012-08-01 13:33:51 +02:00
2011-11-05 16:51:25 +01:00
2012-08-02 14:39:45 +02:00
2012-08-06 21:36:42 +02:00
2011-12-19 11:57:34 +01:00
2012-06-09 10:57:14 +00:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-08-09 19:56:25 +02:00
2012-07-30 02:45:21 +00:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-07-10 13:27:16 +02:00
2012-07-03 09:53:42 +00:00
2012-05-21 08:51:50 +02:00
2012-07-29 01:28:12 +00:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-08-01 08:33:18 +02:00
2012-08-06 01:38:18 +02:00
2012-08-06 00:37:28 +02:00
2012-08-06 02:51:11 +02:00
2012-08-04 19:37:24 +02:00
2012-07-05 04:23:55 +02:00
2012-07-20 11:16:52 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-08-03 15:18:12 +00:00
2012-06-29 20:22:04 +02:00
2012-08-01 22:06:16 -04:00
2012-06-29 20:21:28 +02:00
2012-02-23 16:00:22 +01:00
2012-07-25 20:31:16 +03:00
2012-07-08 20:49:35 +00:00
2012-07-26 22:22:54 +02:00
2012-05-18 23:34:11 +02:00
2012-06-25 16:20:08 +03:00
2012-07-06 17:08:22 +02:00
2012-07-29 01:28:12 +00:00
2012-07-06 17:08:22 +02:00
2012-08-01 03:15:32 +00:00