Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-12-12 16:47:44 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-12-25 01:22:16 +0400
commit691dec62011fe9993809fbc793126b40cac0c584 (patch)
tree474924880c7678d26a6872fe446477717531eb8f /libavcodec/8bps.c
parentd63e9943615fe4a7dece768e5c91616a7f63283a (diff)
Allow stream-copying grayscale mov files.
This reverts 0de2157f / r12272. Fixes ticket #3215. Signed-off-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 d01ef924c7..1709368c65 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 <= 8) {
+ if ((avctx->bits_per_coded_sample & 0x1f) <= 8) {
const uint8_t *pal = av_packet_get_side_data(avpkt,
AV_PKT_DATA_PALETTE,
NULL);