]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d23fff0 cad739d)
Merge commit 'cad739dace55e3446ef7180de688173cd19fb000'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:22:30 +0000 (22:22 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:22:30 +0000 (22:22 +0000)
* commit 'cad739dace55e3446ef7180de688173cd19fb000':
  lavc: Add per-thread surfaces in get_hw_frame_parameters()

Merged-by: Mark Thompson <sw@jkqxz.net>
1  2 
libavcodec/decode.c patch | diff1 | diff2 | blob | history
libavcodec/dxva2.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/decode.c
Simple merge
diff --cc libavcodec/dxva2.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.