diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 11:37:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 12:05:42 +0200 |
| commit | 5a0862af55298259c4528645695c8348c830be38 (patch) | |
| tree | 832d38a04efde59f6a0caba3c13394ca98df58a3 | |
| parent | 6e94e77632df457da03b5c27fff8a1b976f6994d (diff) | |
| download | ffmpeg-5a0862af55298259c4528645695c8348c830be38.tar.gz | |
avcodec/h264_slice: Use AVFrame diemensions for grayscale handling
The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit aef0e0f009802f1a5e21eb6465498632071e4475)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index f12e4b75e8..9c4d613195 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -251,11 +251,11 @@ static int alloc_picture(H264Context *h, H264Picture *pic) av_pix_fmt_get_chroma_sub_sample(pic->f->format, &h_chroma_shift, &v_chroma_shift); - for(i=0; i<FF_CEIL_RSHIFT(h->avctx->height, v_chroma_shift); i++) { + for(i=0; i<FF_CEIL_RSHIFT(pic->f->height, v_chroma_shift); i++) { memset(pic->f->data[1] + pic->f->linesize[1]*i, - 0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift)); + 0x80, FF_CEIL_RSHIFT(pic->f->width, h_chroma_shift)); memset(pic->f->data[2] + pic->f->linesize[2]*i, - 0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift)); + 0x80, FF_CEIL_RSHIFT(pic->f->width, h_chroma_shift)); } } |