diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-26 15:30:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-26 15:41:27 +0100 |
| commit | cd5a48e549847c177325dc87a998de67b0a9a6c1 (patch) | |
| tree | 3edd598bf977d95d7eaa47ce068014fc0d672b69 /libavcodec | |
| parent | 47aee6f047d01df623a9a5342564dc2369e024f6 (diff) | |
| download | ffmpeg-cd5a48e549847c177325dc87a998de67b0a9a6c1.tar.gz | |
avcodec/h264_slice: Put CONFIG_GRAY first in if()
This is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1e28c604a9..dfb44ac4f3 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); |