[FFmpeg-cvslog] Merge commit 'd3e4d406b020b0464486318aceda08bd8f69ca41'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 21:41:29 2017 -0300| [65ff562c3b305ed7ef979b3182de1c5e7264dd22] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65ff562c3b305ed7ef979b3182de1c5e7264dd22
---