[FFmpeg-cvslog] Merge remote-tracking branch 'cigaes/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug  7 17:39:42 2013 +0200| [b11b7ceb8926703d1fac8adc3595a20ab7afb471] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b11b7ceb8926703d1fac8adc3595a20ab7afb471
---