[FFmpeg-cvslog] avutil/frame_copy_audio: also check that channels match

Michael Niedermayer git at videolan.org
Mon Feb 24 10:47:04 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 09:52:13 2014 +0100| [74bb1ca82c3bf604e460f581d9ac9dbe2af19448] | committer: Michael Niedermayer

avutil/frame_copy_audio: also check that channels match

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

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

 libavutil/frame.c |    1 +
 1 file changed, 1 insertion(+)

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



More information about the ffmpeg-cvslog mailing list