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)
commit65ff562c3b305ed7ef979b3182de1c5e7264dd22
treefeec7af17e1a861b058d339bbf2713d57fbe311e
parent67817468d3fdabce64239c75c216337f66136682
parentd3e4d406b020b0464486318aceda08bd8f69ca41
Merge commit 'd3e4d406b020b0464486318aceda08bd8f69ca41'

* 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>