diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-15 21:41:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-15 21:41:29 -0300 |
| commit | 65ff562c3b305ed7ef979b3182de1c5e7264dd22 (patch) | |
| tree | feec7af17e1a861b058d339bbf2713d57fbe311e /libavcodec/psd.c | |
| parent | 67817468d3fdabce64239c75c216337f66136682 (diff) | |
| parent | d3e4d406b020b0464486318aceda08bd8f69ca41 (diff) | |
| download | ffmpeg-65ff562c3b305ed7ef979b3182de1c5e7264dd22.tar.gz | |
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>
Diffstat (limited to 'libavcodec/psd.c')
0 files changed, 0 insertions, 0 deletions