projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32c7769
)
imc: set channels to 1 instead of validating it
author
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 22 Oct 2012 19:54:29 +0000
(15:54 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 1 Nov 2012 15:29:17 +0000
(11:29 -0400)
libavcodec/imc.c
patch
|
blob
|
history
diff --git
a/libavcodec/imc.c
b/libavcodec/imc.c
index 1156e8aac241925efc380768d6acc0704b706575..4c2d01d0251633780d0685a224056932928e7dd4 100644
(file)
--- a/
libavcodec/imc.c
+++ b/
libavcodec/imc.c
@@
-175,8
+175,10
@@
static av_cold int imc_decode_init(AVCodecContext *avctx)
IMCContext *q = avctx->priv_data;
double r1, r2;
- if ((avctx->codec_id == AV_CODEC_ID_IMC && avctx->channels != 1)
- || (avctx->codec_id == AV_CODEC_ID_IAC && avctx->channels > 2)) {
+ if (avctx->codec_id == AV_CODEC_ID_IMC)
+ avctx->channels = 1;
+
+ if (avctx->channels > 2) {
av_log_ask_for_sample(avctx, "Number of channels is not supported\n");
return AVERROR_PATCHWELCOME;
}