aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv40dsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-03 11:20:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-03 11:20:39 +0200
commit37a970bbb668956956c632652a4316cceb48955a (patch)
tree5e060b0057dc9ca87abbeeb39b3b08bd58cb9abb /libavcodec/rv40dsp.c
parentb2498dcf5ca9473da4a63aebec9765e410f13dbb (diff)
parent5650e331a733711b809bc27f968500f0f5530126 (diff)
downloadffmpeg-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 'libavcodec/rv40dsp.c')
0 files changed, 0 insertions, 0 deletions