ffmpeg/libavcodec
Michael Niedermayer 2fd4901921 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
	libavcodec/libx264.c
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-06 21:35:18 +02:00
..
2011-08-15 00:39:55 +02:00
2011-08-12 17:20:57 +02:00
2011-08-15 00:39:55 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-08-30 05:41:44 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-07-21 18:10:58 +01:00
2011-09-06 18:20:34 +02:00
2011-09-06 19:50:01 +02:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-08-15 00:39:55 +02:00
2011-09-01 02:38:56 +02:00
2011-08-15 00:39:55 +02:00