diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 11:55:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 11:55:45 +0200 |
| commit | 3f0364327c32175221104799958702458be8fbd6 (patch) | |
| tree | 398f383c6ec344d8e64e24e5585606adf25ff5ae /libavutil/atomic_win32.h | |
| parent | 37a970bbb668956956c632652a4316cceb48955a (diff) | |
| parent | fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e (diff) | |
| download | ffmpeg-3f0364327c32175221104799958702458be8fbd6.tar.gz | |
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
jpeg2000: Check code-block size
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/atomic_win32.h')
0 files changed, 0 insertions, 0 deletions