diff options
| author | Michael Niedermayer <[email protected]> | 2014-01-21 15:42:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-23 16:42:21 +0100 |
| commit | 2368d08e701acf7942bf6d70a40a3e70186199ea (patch) | |
| tree | 33dc8bc79cf603e85e02a949f2c2c0755d6b0aa2 /libavformat/options_table.h | |
| parent | ea7ccf3748452b614b6ae81fa814303a49733fc2 (diff) | |
Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'
* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
hevc: Bound check cu_qp_delta
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <[email protected]>
(cherry picked from commit a69dd1163b1a91978e596af551c9561d121aeedf)
Conflicts:
libavcodec/hevc.c
Diffstat (limited to 'libavformat/options_table.h')
0 files changed, 0 insertions, 0 deletions