ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Aug 25 02:59:17 2014 +0200| [a2841d92c384e345cbbeffab72406405a0d9410c] | committer: Michael Niedermayer
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" > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2841d92c384e345cbbeffab72406405a0d9410c --- libavcodec/pnmenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 9198ddb..e6c3635 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
