summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-10-01 15:19:18 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-10-01 15:19:18 +0200
commit62c58c59d54fda034ed7f7c16e3faa1bdaa1e16d (patch)
treec4e287170af6d154c2979f8a5c6ee8730238e997 /doc/libav-merge.txt
parent04b17ff9e819bde4c4fbcccf2b6d8d2781a798b0 (diff)
parentac7bfd69678f3966e38debdb27f4bde94dc0345c (diff)
Merge commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c'
* commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c': lavfi: add a QSV scaling filter This is a noop since it depends on sharing a hwcontext with the decoder/encoder, see 04b17ff and 130e1f1 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'doc/libav-merge.txt')
0 files changed, 0 insertions, 0 deletions