From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Sun, 13 Jul 2014 18:32:56 +0000 (+0100)
Subject: Revert "lavc/utils: Do not require dimensions for PNG."
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=43654a22c037a86c23e7aed90660c5ea3971e56d;p=ffmpeg

Revert "lavc/utils: Do not require dimensions for PNG."

mplayer-specifc hacks should not be in our codebase. mplayer should fix
its own code. It is not our responsibility to work around their broken
code.

This reverts commit e8e575633faf19711910cf9caf59f7db300a9ccd.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0bc0b3888f5..62d4b264c30 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1531,9 +1531,7 @@ 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 &&
-           avctx->codec_id != AV_CODEC_ID_PNG // For mplayer
-        ) {
+        if(avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
             if (avctx->width <= 0 || avctx->height <= 0) {
                 av_log(avctx, AV_LOG_ERROR, "dimensions not set\n");
                 ret = AVERROR(EINVAL);