diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-11 20:09:07 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-11 20:09:07 +0100 |
| commit | 54bbe3e2a645b4f7b36efac2bca331d3be98592a (patch) | |
| tree | b110785a1310fa2e0364d5db514f91adb475187c /libavcodec/msrle.c | |
| parent | 5d75730c58f72918a41bb5abda4b448ecdd4273c (diff) | |
| download | ffmpeg-54bbe3e2a645b4f7b36efac2bca331d3be98592a.tar.gz | |
Revert "Allow stream-copying grayscale mov files."
This reverts commit 691dec62011fe9993809fbc793126b40cac0c584.
The commit did not fix ticket #3215, it was fixed one commit earlier.
The revert may break other use-cases but they should be fixed differently,
the offending commit introduced too many problems.
Fixes ticket #3377.
Fixes ticket #3378.
Diffstat (limited to 'libavcodec/msrle.c')
| -rw-r--r-- | libavcodec/msrle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index ad04ce8984..750e54ae99 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -55,7 +55,7 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx) s->avctx = avctx; - switch (avctx->bits_per_coded_sample & 0x1f) { + switch (avctx->bits_per_coded_sample) { case 1: avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; break; |