Commit a2841d92 authored by Michael Niedermayer's avatar Michael Niedermayer

Revert "pnmenc: use bits_per_raw_sample"

This reverts commit 1506ea94.

Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"
parent 30f680ee
...@@ -84,8 +84,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -84,8 +84,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream += strlen(bytestream); bytestream += strlen(bytestream);
if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) { 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; 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, snprintf(bytestream, bytestream_end - bytestream,
"%d\n", maxdepth); "%d\n", maxdepth);
bytestream += strlen(bytestream); bytestream += strlen(bytestream);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment