diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 01:00:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 01:05:46 +0200 |
| commit | 45283653a30e33a8ef0e35f2f6f502de2f93ce22 (patch) | |
| tree | 59f9df323a80bc716c148b63d93c51a7bdb15cca /ffmpeg_filter.c | |
| parent | 6af1793dd5a26b0617b31b0165f94d4bfc7c5160 (diff) | |
| parent | e0fcad77618a0455ca9c2451ea0aa538597a08c0 (diff) | |
| download | ffmpeg-45283653a30e33a8ef0e35f2f6f502de2f93ce22.tar.gz | |
Merge commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0' into release/1.1
* commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0':
avconv: make -shortest work with streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions