[FFmpeg-devel] [PATCH] Revert "lavc/utils: Do not require dimensions for PNG."

[wm4]

On Sun, 13 Jul 2014 19:32:56 +0100
Derek Buitenhuis <derek.buitenhuis at gmail.com> wrote:

> mplayer-specifc hacks should not be in our codebase. mplayer should fix
> it's own code. It is not our responsibility to work around their broken
> code.
> 
> This reverts commit e8e575633faf19711910cf9caf59f7db300a9ccd.
> 
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> ---
>  libavcodec/utils.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index 9fa8e16..6a8992a 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -1533,9 +1533,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);

+1

The (removed) comment says it all. A project specific hack for
something that used the API incorrectly. I surely hope mplayer fixed
this in the meantime on their side, they had time enough to do that.