diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:22:53 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:22:53 +0100 |
| commit | 5bc9c7a6db1caaae2bbc2061f16af28695a6fdd6 (patch) | |
| tree | aa392fc97221a53e8308d8a6277a482c88bf44c1 /libavfilter/af_amerge.c | |
| parent | 24563c20f181cb9d7015e9595d9cb6846cf02dfa (diff) | |
| parent | fc4c27c4edfc6a5f9bc7c696e823652474a65ce8 (diff) | |
| download | ffmpeg-5bc9c7a6db1caaae2bbc2061f16af28695a6fdd6.tar.gz | |
Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'
* commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8':
qsvenc: expose additional encoding options
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions