diff options
| author | Clément Bœsch <u@pkh.me> | 2016-09-25 19:15:44 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-09-25 19:15:44 +0200 |
| commit | 99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9 (patch) | |
| tree | 188f2374616a4b2d32e0d2f89f6361816c99bc7e /tools/libav-merge-next-commit | |
| parent | 21344991c0d2a651d221dbdbb416031462a70d2c (diff) | |
| parent | 1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3 (diff) | |
| download | ffmpeg-99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9.tar.gz | |
Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'
* commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3':
avconv: do not set encoder options when streamcopy is used
This chunk was removed in 955b818cf947473ec94a3fe8aa7f408b119fbbc9
already.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'tools/libav-merge-next-commit')
0 files changed, 0 insertions, 0 deletions