summaryrefslogtreecommitdiff
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-30 02:12:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-30 02:12:53 +0100
commit4aa9c91508203fdcaa687abff2d8d4ae46d4cde6 (patch)
tree720510e61e5045d8775eff5219c8e82799ebd029 /libavresample
parente80aa47abf74b9dda336d3e156fb49402093ec44 (diff)
parentde40905f55cdd668b50a143f8e30936d22a09a37 (diff)
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>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions