mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-16 11:47:04 +00:00
avcodec/jpeg2000dec: Check for reduction factor and image offset
This combination is not working (it writes out of array)
Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9b6d191a66
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
8fcef8c827
commit
fd600a9cc1
@ -312,6 +312,11 @@ static int get_siz(Jpeg2000DecoderContext *s)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if (s->reduction_factor && (s->image_offset_x || s->image_offset_y) ){
|
||||
av_log(s->avctx, AV_LOG_ERROR, "reduction factor with image offsets is not fully implemented");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
s->ncomponents = ncomponents;
|
||||
|
||||
if (s->tile_width <= 0 || s->tile_height <= 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user