aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/8bps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-12 12:20:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-12 12:20:06 +0100
commit3ddf76ee070d072ed4cdeb7ec6585cea3e4b72eb (patch)
treed9fb8ca45f6644331e4b7d06d403026f36397d0a /libavcodec/8bps.c
parent1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f (diff)
parent54bbe3e2a645b4f7b36efac2bca331d3be98592a (diff)
downloadffmpeg-3ddf76ee070d072ed4cdeb7ec6585cea3e4b72eb.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Revert "Allow stream-copying grayscale mov files." Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/8bps.c')
-rw-r--r--libavcodec/8bps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 1709368c65..d01ef924c7 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -119,7 +119,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
}
}
- if ((avctx->bits_per_coded_sample & 0x1f) <= 8) {
+ if (avctx->bits_per_coded_sample <= 8) {
const uint8_t *pal = av_packet_get_side_data(avpkt,
AV_PKT_DATA_PALETTE,
NULL);