aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-19 16:34:12 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-19 16:34:12 +0200
commit9c943e077bfc23ba8d2e76a17fef7acbab4dd706 (patch)
tree62bba1edfa79d9b614746ba9f620a0ca51d72638 /doc
parentf929081f2e64d979fd8c58b17705e9554f99baf9 (diff)
parent69b92f1b99f3f210be19ee6ec06f6c0de1733031 (diff)
downloadffmpeg-9c943e077bfc23ba8d2e76a17fef7acbab4dd706.tar.gz
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031': qsvenc: properly handle asynchronous encoding Conflicts: libavcodec/qsvenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions