diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 00:06:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 00:06:36 +0200 |
| commit | 220bbc44c2cfc9c291b16b9fdd6ee70d27298d8b (patch) | |
| tree | fc78361cb83795d0e5a1ec43ea222f069ce7d5a6 /tools/zmqshell.py | |
| parent | f378636d90af664e162f75c295167078e3a97360 (diff) | |
| parent | 6672f672d98cf4887e13321b6f67682cfd1273b4 (diff) | |
| download | ffmpeg-220bbc44c2cfc9c291b16b9fdd6ee70d27298d8b.tar.gz | |
Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2
* commit '6672f672d98cf4887e13321b6f67682cfd1273b4':
avconv: make -shortest work with streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions