aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-25 02:59:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-25 02:59:17 +0200
commita2841d92c384e345cbbeffab72406405a0d9410c (patch)
treecc0c80c0d80b612c98cd7608c013bfb780d770b3
parent30f680ee0a2707af9a649a0aa3fd951d18a25c05 (diff)
downloadffmpeg-a2841d92c384e345cbbeffab72406405a0d9410c.tar.gz
Revert "pnmenc: use bits_per_raw_sample"
This reverts commit 1506ea947d3c527f67a5caa93cc7fa0d064bbf1f. Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"
-rw-r--r--libavcodec/pnmenc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index 9198ddbcad..e6c3635e7b 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -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);