diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 19:56:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 19:58:25 +0200 |
commit | acc7cf70dc09ec3e425f7c4fa5e0be427b3f0790 (patch) | |
tree | 1d16c5912fa1551574b4df137fe57b8d7bc5d545 /libavcodec/diracdsp.h | |
parent | 057d2704e78b52fec357b4fc646c9de37a085413 (diff) | |
parent | 9b60d9197970658e91daf4b586397f450de9af69 (diff) | |
download | ffmpeg-acc7cf70dc09ec3e425f7c4fa5e0be427b3f0790.tar.gz |
Merge commit '9b60d9197970658e91daf4b586397f450de9af69'
* commit '9b60d9197970658e91daf4b586397f450de9af69':
hevc: Allow out of bound values for num_reorder_pics
Conflicts:
libavcodec/hevc_ps.c
See: bc21260e643c2249e38f7485bceada1d4bbb2b9a
See: ab296c7a9fe590860dc95ba97e9cbb9dde798f20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/diracdsp.h')
0 files changed, 0 insertions, 0 deletions