From be40d6cc2bc99ef90954c85f2bc77f95944ba723 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Sat, 9 Mar 2013 16:47:38 +0100
Subject: rawdec: fix a typo -- || instead of |

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
 libavcodec/rawdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavcodec/rawdec.c')

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 59a6dd676d..0a76e4d383 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -98,7 +98,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
         return AVERROR(EINVAL);
     }
 
-    if (desc->flags & (PIX_FMT_PAL || PIX_FMT_PSEUDOPAL)) {
+    if (desc->flags & (PIX_FMT_PAL | PIX_FMT_PSEUDOPAL)) {
         context->palette = av_buffer_alloc(AVPALETTE_SIZE);
         if (!context->palette)
             return AVERROR(ENOMEM);
-- 
cgit v1.2.3