[FFmpeg-cvslog] pgmyuvenc: do not create files which are not supported

Paul B Mahol git at videolan.org
Wed Oct 24 21:02:19 CEST 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Oct 24 18:38:31 2012 +0000| [6ddb03caf0029b72db3cc7e4fd362e76c0d92c87] | committer: Paul B Mahol

pgmyuvenc: do not create files which are not supported

It is possible to support files with odd width and/or height
if real width and height are stored in header.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ddb03caf0029b72db3cc7e4fd362e76c0d92c87
---

 libavcodec/pnmenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index e311b2e..ab20cf5 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -69,8 +69,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         n  = avctx->width * 6;
         break;
     case AV_PIX_FMT_YUV420P:
-        if (avctx->width & 1) {
-            av_log(avctx, AV_LOG_ERROR, "pgmyuv needs even width\n");
+        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';



More information about the ffmpeg-cvslog mailing list