Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Aug 2011 21:35:22 +0000 (23:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Aug 2011 22:01:48 +0000 (00:01 +0200)
commit9a5f61ac62ab1a191f0ea81caef1e386a4c1e242
treed853b7de1ed0aad3e4e237e0d72530733481727f
parent640a905ece0fecc83f05dfaca7e91a0ecc65d746
parent5caa2de19ece830e32c95731bc92a423d55cff0c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: do not set pic quality if no frame is output
  libx264: add preset, tune, profile and fastfirstpass private options

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx264.c