diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:46:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:46:25 +0200 |
commit | fbdbe7a5d262db06ae44a7bd606d18954241c040 (patch) | |
tree | 782d065f8394f3c41ad0285b2d4ef33b4b682ac7 /libavformat/libsmbclient.c | |
parent | e1b5a2e46ef0734d149c2cbbc8a5a82be100c617 (diff) | |
parent | ecee1148af4989e1f9e16f0cdc9f98ad2045538c (diff) | |
download | ffmpeg-fbdbe7a5d262db06ae44a7bd606d18954241c040.tar.gz |
Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
qsvenc_hevc: use the correct HW plugin UID
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/libsmbclient.c')
0 files changed, 0 insertions, 0 deletions