summaryrefslogtreecommitdiff
path: root/libavcodec/msrle.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-12-12 13:47:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-24 22:22:16 +0100
commit691dec62011fe9993809fbc793126b40cac0c584 (patch)
tree474924880c7678d26a6872fe446477717531eb8f /libavcodec/msrle.c
parentd63e9943615fe4a7dece768e5c91616a7f63283a (diff)
downloadffmpeg-691dec62011fe9993809fbc793126b40cac0c584.tar.gz
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/msrle.c')
-rw-r--r--libavcodec/msrle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 2836fec2fd..7ae4b08ba6 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -54,7 +54,7 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
s->avctx = avctx;
- switch (avctx->bits_per_coded_sample) {
+ switch (avctx->bits_per_coded_sample & 0x1f) {
case 1:
avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
break;