diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-08-24 21:30:46 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-28 14:16:37 +0100 |
| commit | 82978539171f32d0e1cf3bb4b452de4c1a920bae (patch) | |
| tree | b17ba37e11bd63258a50b27e4ba74fbb22f6268c /libavcodec/pictordec.c | |
| parent | b8ba48c725dcda56d5dccc1474322857a7e3ed13 (diff) | |
| download | ffmpeg-82978539171f32d0e1cf3bb4b452de4c1a920bae.tar.gz | |
pictordec: pass correct context to avpriv_request_sample
Fixes invalid reads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry-picked from commit fe9bb61f9a16be19ad91875632c39e44b7a99a8a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/pictordec.c
Diffstat (limited to 'libavcodec/pictordec.c')
| -rw-r--r-- | libavcodec/pictordec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 88add167cf..6f2193d511 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -121,7 +121,7 @@ static int decode_frame(AVCodecContext *avctx, s->nb_planes = (tmp >> 4) + 1; bpp = bits_per_plane * s->nb_planes; if (bits_per_plane > 8 || bpp < 1 || bpp > 32) { - av_log_ask_for_sample(s, "unsupported bit depth\n"); + av_log_ask_for_sample(avctx, "unsupported bit depth\n"); return AVERROR_INVALIDDATA; } @@ -233,7 +233,7 @@ static int decode_frame(AVCodecContext *avctx, } } } else { - av_log_ask_for_sample(s, "uncompressed image\n"); + av_log_ask_for_sample(avctx, "uncompressed image\n"); return avpkt->size; } finish: |