Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Aug 2013 15:39:42 +0000 (17:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Aug 2013 17:16:12 +0000 (19:16 +0200)
commitb11b7ceb8926703d1fac8adc3595a20ab7afb471
tree03b7e0b35c9f16fa103b0902734739f7fb9c4009
parent60ae776d04b69af23ea517cbf140bfd4bae7ddcb
parentdd9555e94b1481a6992ee89b285232e5abcf9089
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: remove obsolete workaround in trim insertion.
  lavu/log: do not skip overwritten lines.

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