Revert "pnmenc: use bits_per_raw_sample"
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 00:59:17 +0000 (02:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 00:59:17 +0000 (02:59 +0200)
This reverts commit 1506ea947d3c527f67a5caa93cc7fa0d064bbf1f.

Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"

libavcodec/pnmenc.c

index 9198ddb..e6c3635 100644 (file)
@@ -84,8 +84,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     bytestream += strlen(bytestream);
     if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {
         int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1;
-        if( avctx->bits_per_raw_sample )
-            maxdepth = (1 << avctx->bits_per_raw_sample) - 1;
         snprintf(bytestream, bytestream_end - bytestream,
                  "%d\n", maxdepth);
         bytestream += strlen(bytestream);