ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Mar 26 15:30:20 2015 +0100| [cd5a48e549847c177325dc87a998de67b0a9a6c1] | committer: Michael Niedermayer
avcodec/h264_slice: Put CONFIG_GRAY first in if() This is more consistent Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd5a48e549847c177325dc87a998de67b0a9a6c1 --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1e28c60..dfb44ac 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -246,7 +246,7 @@ static int alloc_picture(H264Context *h, H264Picture *pic) pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data; } } - if (!h->avctx->hwaccel && CONFIG_GRAY && h->flags & CODEC_FLAG_GRAY && pic->f.data[2]) { + if (CONFIG_GRAY && !h->avctx->hwaccel && h->flags & CODEC_FLAG_GRAY && pic->f.data[2]) { int h_chroma_shift, v_chroma_shift; av_pix_fmt_get_chroma_sub_sample(pic->f.format, &h_chroma_shift, &v_chroma_shift); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
