]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6781746 d3e4d40)
Merge commit 'd3e4d406b020b0464486318aceda08bd8f69ca41'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:41:29 +0000 (21:41 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:41:29 +0000 (21:41 -0300)
* commit 'd3e4d406b020b0464486318aceda08bd8f69ca41':
  h264dec: reset nb_slice_ctx_queued for hwaccel decoding

This commit is a noop, see 744801989099df26e90b00062c645969c5347533

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.