Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Sep 2011 19:35:18 +0000 (21:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Sep 2011 19:35:18 +0000 (21:35 +0200)
commit2fd49019210a9fbe430b1b94ff7a2f98a6d0fed1
tree15a45d423407f9a2c2cafd290915e3756f4fab94
parentff5e1b0b7a975fc84137381dd15dcc5a5ff21a78
parent7042337673ee75300a6f668fbcf3074213b06977
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>
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/mpeg12.c
libavcodec/options.c