Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 11:20:08 +0000 (13:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 11:48:26 +0000 (13:48 +0200)
commite1f729d977be579ea75d1d3a3d5cffcf17865e86
tree8e41fffaf4badf9477863a64e6bc4a3ff321246c
parent14e2406de7d211d50fcce0059c90103bdaa947aa
parentd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b
Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'

* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_compand.c