OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d468ed
)
pamenc: allocate the correct packetsize for mono.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 19 Feb 2012 03:15:22 +0000
(
04:15
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 19 Feb 2012 03:15:22 +0000
(
04:15
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pamenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/pamenc.c
b/libavcodec/pamenc.c
index
b2c6c3e
..
d1de7a0
100644
(file)
--- 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;
}