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

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Jan 30 01:33:18 2017 +0100| [d25769555bb3e73c811da05d309856883ff41a9f] | committer: Marton Balint

avutil/frame: fix av_frame_copy for unknown layouts

I wonder how unknown layouts ever worked without this?

Reviewed-by: Nicolas George <george at nsup.org>
Reviewed-by: Hendrik Leppkes <h.leppkes at gmail.com>
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Marton Balint <cus at passwd.hu>

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

 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);