aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-19 04:15:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-19 04:15:22 +0100
commitd3f81a67008b6418b9f22d865294898915fb3ad8 (patch)
treee1f14c6672330deb4698bf8d7ea4f5c8036fe333
parent5d468edb2e947b804155b1d2e21b14b2a9d94320 (diff)
downloadffmpeg-d3f81a67008b6418b9f22d865294898915fb3ad8.tar.gz
pamenc: allocate the correct packetsize for mono.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/pamenc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c
index b2c6c3ea9a..d1de7a0e33 100644
--- a/libavcodec/pamenc.c
+++ b/libavcodec/pamenc.c
@@ -37,7 +37,7 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
w = avctx->width;
switch (avctx->pix_fmt) {
case PIX_FMT_MONOBLACK:
- n = (w + 7) >> 3;
+ n = w;
depth = 1;
maxval = 1;
tuple_type = "BLACKANDWHITE";
@@ -88,9 +88,7 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return -1;
}
- if ((ret = ff_alloc_packet(pkt, avpicture_get_size(avctx->pix_fmt,
- avctx->width,
- avctx->height) + 200)) < 0) {
+ if ((ret = ff_alloc_packet(pkt, n*h + 200)) < 0) {
av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
return ret;
}