diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-17 13:55:50 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-17 13:55:50 +0200 |
commit | 5eba94a8c392be44a868183cdacff9a38fe55448 (patch) | |
tree | 0402d9c1ac96982a7665a66d30318fe775ed5740 /libavformat/rtmpcrypt.c | |
parent | f6e8d54fcc17660a8c34512bdc73541664942a5f (diff) | |
parent | 6aa4ba7131b6e8668e33430e18101a051fe492eb (diff) | |
download | ffmpeg-5eba94a8c392be44a868183cdacff9a38fe55448.tar.gz |
Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'
* commit '6aa4ba7131b6e8668e33430e18101a051fe492eb':
dxva2: Keep code shared between dxva2 and d3d11va under the correct #if
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/rtmpcrypt.c')
0 files changed, 0 insertions, 0 deletions