diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-09 16:47:38 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-13 09:13:54 +0100 |
| commit | be40d6cc2bc99ef90954c85f2bc77f95944ba723 (patch) | |
| tree | dc7271030aa62c4a408492d54ae8c8c911465bcb | |
| parent | 37cb3b180a1dc3d6f123f68e0806585ebc2578b6 (diff) | |
| download | ffmpeg-be40d6cc2bc99ef90954c85f2bc77f95944ba723.tar.gz | |
rawdec: fix a typo -- || instead of |
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/rawdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |