diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:26:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:26:12 -0300 |
| commit | e9a5fc967867f9bd361f472306ca130bb64b0b04 (patch) | |
| tree | bf88785dc19a742e8b121fd78ce2c65a71a3322d /doc | |
| parent | 32c25f06b79f9edcda726f6e043325d40036cdce (diff) | |
| parent | 6f19bbcf8532d018d8d6d82e000738d0ac2385c9 (diff) | |
| download | ffmpeg-e9a5fc967867f9bd361f472306ca130bb64b0b04.tar.gz | |
Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'
* commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9':
qsvdec: move reading the user-provided session to qsv_decode_init()
Conflicts:
libavcodec/qsvdec.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions