diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:13:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:13:35 +0200 |
| commit | f929081f2e64d979fd8c58b17705e9554f99baf9 (patch) | |
| tree | 2d0ebbfdefb78f3921f4c4a425a80e3f548a1a3e /doc | |
| parent | 7093e215d02ed0dc9632f82ac8ccec432d29cd35 (diff) | |
| parent | f5c4d38c78347b09478e21a661befff4b2d44643 (diff) | |
| download | ffmpeg-f929081f2e64d979fd8c58b17705e9554f99baf9.tar.gz | |
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions