Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:04:56 +0000 (00:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:05:23 +0000 (00:05 +0100)
* cigaes/master:
  lavu: add myself as dynarray.h maintainer.
  ffmpeg: sub2video: send a last blank frame before closing.
  tools: add dvd2concat.
  lavf/concatdec: allow to match streams by id.

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

Trivial merge