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)
commit3788b8dbe698384d0167c9f79242d9076168f178
tree202fbf9d01e1a69eb7a749e2cf7f37cf56941a73
parent5dfbecb3a37423227d7739983b7289bd05feab8c
parentc0c1fe797cdfa9188c0415a2570e61bf0964ab1c
Merge remote-tracking branch 'cigaes/master'

* 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>