summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-24 09:52:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-24 10:12:33 +0100
commit74bb1ca82c3bf604e460f581d9ac9dbe2af19448 (patch)
tree8eae88b440d1624f164dd3f98009986339d54fbb
parentfff526230148b3a67c04c328eecb16efac654e68 (diff)
downloadffmpeg-74bb1ca82c3bf604e460f581d9ac9dbe2af19448.tar.gz
avutil/frame_copy_audio: also check that channels match
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/frame.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 9b4ecfcc0f..747aa79b8f 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);