diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-07-13 19:32:56 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-08-10 15:58:13 +0100 |
| commit | 43654a22c037a86c23e7aed90660c5ea3971e56d (patch) | |
| tree | ae7b223cd47dee20815c108fe0244f96520ac4d7 | |
| parent | 7117547298b13d6f52a20d6a62a27dc0a1c3e263 (diff) | |
| download | ffmpeg-43654a22c037a86c23e7aed90660c5ea3971e56d.tar.gz | |
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>
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0bc0b3888f..62d4b264c3 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); |