This reverts commit 1506ea947d3c527f67a5caa93cc7fa0d064bbf1f. Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"
Unified · Split
| @@ -84,8 +84,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 83 unmodified lines | |||
| 84 | bytestream += strlen(bytestream); | 84 | bytestream += strlen(bytestream); |
| 85 | if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) { | 85 | if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) { |
| 86 | int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1; | 86 | int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1; |
| 87 | if( avctx->bits_per_raw_sample ) | ||
| 88 | maxdepth = (1 << avctx->bits_per_raw_sample) - 1; | ||
| 89 | snprintf(bytestream, bytestream_end - bytestream, | 87 | snprintf(bytestream, bytestream_end - bytestream, |
| 90 | "%d\n", maxdepth); | 88 | "%d\n", maxdepth); |
| 91 | bytestream += strlen(bytestream); | 89 | bytestream += strlen(bytestream); |