projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
c266d0e
)
Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 19 Dec 2014 12:36:25 +0000
(13:36 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 19 Dec 2014 12:39:41 +0000
(13:39 +0100)
* commit '
cee4490b521fd0d02476d46aa2598af24fb8d686
':
on2avc: check number of channels
See:
550f3e9df3410b3dd975e590042c0d83e20a8da3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/on2avc.c
patch
|
blob
|
history
diff --git
a/libavcodec/on2avc.c
b/libavcodec/on2avc.c
index
01977e5
..
9bf5e87
100644
(file)
--- a/
libavcodec/on2avc.c
+++ b/
libavcodec/on2avc.c
@@
-923,6
+923,7
@@
static av_cold int on2avc_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "0x500 version should be mono\n");
return AVERROR_INVALIDDATA;
}
+
if (avctx->channels == 2)
av_log(avctx, AV_LOG_WARNING,
"Stereo mode support is not good, patch is welcome\n");