aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/avf_concat.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-11-29 15:22:53 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-11-29 15:22:53 +0100
commit5bc9c7a6db1caaae2bbc2061f16af28695a6fdd6 (patch)
treeaa392fc97221a53e8308d8a6277a482c88bf44c1 /libavfilter/avf_concat.c
parent24563c20f181cb9d7015e9595d9cb6846cf02dfa (diff)
parentfc4c27c4edfc6a5f9bc7c696e823652474a65ce8 (diff)
downloadffmpeg-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/avf_concat.c')
0 files changed, 0 insertions, 0 deletions