[FFmpeg-cvslog] rawdec: fix a typo -- || instead of |

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Mar  9 16:47:38 2013 +0100| [be40d6cc2bc99ef90954c85f2bc77f95944ba723] | committer: Anton Khirnov

rawdec: fix a typo -- || instead of |

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be40d6cc2bc99ef90954c85f2bc77f95944ba723
---

 libavcodec/rawdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 59a6dd6..0a76e4d 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);