OSDN Git Service

Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Dec 2013 01:12:49 +0000 (02:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Dec 2013 01:12:53 +0000 (02:12 +0100)
commit4aa9c91508203fdcaa687abff2d8d4ae46d4cde6
tree720510e61e5045d8775eff5219c8e82799ebd029
parente80aa47abf74b9dda336d3e156fb49402093ec44
parentde40905f55cdd668b50a143f8e30936d22a09a37
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix condition for transparency warning in xsub encoder.
  Allow hiding the banner.

Merged-by: Michael Niedermayer <michaelni@gmx.at>