diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:42:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:42:51 +0100 |
| commit | a69dd1163b1a91978e596af551c9561d121aeedf (patch) | |
| tree | cd4ab5055e1437fd08713556b7b64c53291fb1a0 /libavcodec/adpcm_data.h | |
| parent | 58f437c3f6672f2a42d7e4bee79ad91e9fe4bdcc (diff) | |
| parent | e22ebd04bcab7f86548794556c28ecca46d9c2ac (diff) | |
| download | ffmpeg-a69dd1163b1a91978e596af551c9561d121aeedf.tar.gz | |
Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'
* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
hevc: Bound check cu_qp_delta
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.h')
0 files changed, 0 insertions, 0 deletions