diff options
Diffstat (limited to 'libavcodec/pnmenc.c')
| -rw-r--r-- | libavcodec/pnmenc.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 2e4983ce6c..9b2824a104 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -2,48 +2,40 @@ * PNM image format * Copyright (c) 2002, 2003 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "bytestream.h" #include "internal.h" #include "pnm.h" static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *pict, int *got_packet) + const AVFrame *p, int *got_packet) { PNMContext *s = avctx->priv_data; - AVFrame * const p = &s->picture; int i, h, h1, c, n, linesize, ret; uint8_t *ptr, *ptr1, *ptr2; - if ((ret = ff_alloc_packet(pkt, avpicture_get_size(avctx->pix_fmt, + if ((ret = ff_alloc_packet2(avctx, pkt, avpicture_get_size(avctx->pix_fmt, avctx->width, - avctx->height) + 200)) < 0) { - av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); + avctx->height) + 200)) < 0) return ret; - } - - *p = *pict; - p->pict_type = AV_PICTURE_TYPE_I; - p->key_frame = 1; s->bytestream_start = s->bytestream = pkt->data; @@ -73,6 +65,10 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, n = avctx->width * 6; break; case AV_PIX_FMT_YUV420P: + if (avctx->width & 1 || avctx->height & 1) { + av_log(avctx, AV_LOG_ERROR, "pgmyuv needs even width and height\n"); + return AVERROR(EINVAL); + } c = '5'; n = avctx->width; h1 = (h * 3) / 2; @@ -132,7 +128,6 @@ AVCodec ff_pgm_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE @@ -147,7 +142,6 @@ AVCodec ff_pgmyuv_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGMYUV, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE @@ -162,7 +156,6 @@ AVCodec ff_ppm_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PPM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE @@ -177,7 +170,6 @@ AVCodec ff_pbm_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PBM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, |