diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 11:20:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 11:20:39 +0200 |
| commit | 37a970bbb668956956c632652a4316cceb48955a (patch) | |
| tree | 5e060b0057dc9ca87abbeeb39b3b08bd58cb9abb /libavdevice/alldevices.c | |
| parent | b2498dcf5ca9473da4a63aebec9765e410f13dbb (diff) | |
| parent | 5650e331a733711b809bc27f968500f0f5530126 (diff) | |
| download | ffmpeg-37a970bbb668956956c632652a4316cceb48955a.tar.gz | |
Merge commit '5650e331a733711b809bc27f968500f0f5530126'
* commit '5650e331a733711b809bc27f968500f0f5530126':
jpeg2000: Validate resolution levels
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alldevices.c')
0 files changed, 0 insertions, 0 deletions