[FFmpeg-cvslog] lavc/utils: Do not require dimensions for PNG.

Michael Niedermayer git at videolan.org
Tue Dec 11 22:17:27 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 11 18:25:56 2012 +0100| [e8e575633faf19711910cf9caf59f7db300a9ccd] | committer: Michael Niedermayer

lavc/utils: Do not require dimensions for PNG.

pngenc doesnt need them and mplayer doesnt set them.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/utils.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0a0c446..5ec99d0 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1000,7 +1000,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
         } else if (avctx->channel_layout) {
             avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout);
         }
-        if(avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
+        if(avctx->codec_type == AVMEDIA_TYPE_VIDEO &&
+           avctx->codec_id != AV_CODEC_ID_PNG // For mplayer
+        ) {
             if (avctx->width <= 0 || avctx->height <= 0) {
                 av_log(avctx, AV_LOG_ERROR, "dimensions not set\n");
                 ret = AVERROR(EINVAL);



More information about the ffmpeg-cvslog mailing list