OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fff5262
)
avutil/frame_copy_audio: also check that channels match
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 24 Feb 2014 08:52:13 +0000
(09:52 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 24 Feb 2014 09:12:33 +0000
(10:12 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c
patch
|
blob
|
history
diff --git
a/libavutil/frame.c
b/libavutil/frame.c
index
9b4ecfc
..
747aa79
100644
(file)
--- 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);