diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:38:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:38:29 +0100 |
| commit | 58f437c3f6672f2a42d7e4bee79ad91e9fe4bdcc (patch) | |
| tree | cece09697dfcdc667b683341064b37e240d64ffe /libavcodec/jpeg2000dwt.c | |
| parent | 5b93b2722dea3e73612fe3001113387f842ed9f8 (diff) | |
| parent | 0d999333f96a34903448579bf13a3209deaee9da (diff) | |
| download | ffmpeg-58f437c3f6672f2a42d7e4bee79ad91e9fe4bdcc.tar.gz | |
Merge commit '0d999333f96a34903448579bf13a3209deaee9da'
* commit '0d999333f96a34903448579bf13a3209deaee9da':
hevc: Bound check slice_qp
Conflicts:
libavcodec/hevc.c
See: aead772b5814142b0e530804486ff7970ecd9eef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dwt.c')
0 files changed, 0 insertions, 0 deletions