[FFmpeg-devel] [PATCH] avutil/frame: fix av_frame_copy for unknown layouts

[Hendrik Leppkes]

On Mon, Jan 30, 2017 at 1:37 AM, Marton Balint <cus at passwd.hu> wrote:
> I wonder how unknown layouts ever worked without this?
>
> Signed-off-by: Marton Balint <cus at passwd.hu>
> ---
>  libavutil/frame.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavutil/frame.c b/libavutil/frame.c
> index c2f5509..a08e0c5 100644
> --- a/libavutil/frame.c
> +++ b/libavutil/frame.c
> @@ -725,7 +725,7 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src)
>
>      if (dst->width > 0 && dst->height > 0)
>          return frame_copy_video(dst, src);
> -    else if (dst->nb_samples > 0 && dst->channel_layout)
> +    else if (dst->nb_samples > 0 && dst->channels > 0)
>          return frame_copy_audio(dst, src);
>
>      return AVERROR(EINVAL);
> --
> 2.10.2

Looks good, the copy routine uses dst->channels for copying, not
channel_layout, so that should also be whats checked.

- Hendrik