From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 24 Feb 2014 08:52:13 +0000 (+0100)
Subject: avutil/frame_copy_audio: also check that channels match
X-Git-Tag: n2.2-rc1~91
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/74bb1ca82c3bf604e460f581d9ac9dbe2af19448

avutil/frame_copy_audio: also check that channels match

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 9b4ecfc..747aa79 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -614,6 +614,7 @@ static int frame_copy_audio(AVFrame *dst, const AVFrame *src)
     int i;
 
     if (dst->nb_samples     != src->nb_samples ||
+        dst->channels       != src->channels ||
         dst->channel_layout != src->channel_layout)
         return AVERROR(EINVAL);