diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:04:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:05:23 +0100 |
| commit | 3788b8dbe698384d0167c9f79242d9076168f178 (patch) | |
| tree | 202fbf9d01e1a69eb7a749e2cf7f37cf56941a73 /libavcodec/xface.c | |
| parent | 5dfbecb3a37423227d7739983b7289bd05feab8c (diff) | |
| parent | c0c1fe797cdfa9188c0415a2570e61bf0964ab1c (diff) | |
| download | ffmpeg-3788b8dbe698384d0167c9f79242d9076168f178.tar.gz | |
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>
Diffstat (limited to 'libavcodec/xface.c')
0 files changed, 0 insertions, 0 deletions