repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.2~trusty
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
dcadec.c
diff --git
a/ffmpeg/libavcodec/dcadec.c
b/ffmpeg/libavcodec/dcadec.c
index a36f69b2aec719ec5417453016adc66292a9cdc9..40d8e9e2f0b11ccf26aad4c990135f1103568520 100644
(file)
--- a/
ffmpeg/libavcodec/dcadec.c
+++ b/
ffmpeg/libavcodec/dcadec.c
@@
-2360,6
+2360,10
@@
FF_ENABLE_DEPRECATION_WARNINGS
#else
if (s->xch_present && !s->xch_disable) {
#endif
#else
if (s->xch_present && !s->xch_disable) {
#endif
+ if (avctx->channel_layout & AV_CH_BACK_CENTER) {
+ avpriv_request_sample(avctx, "XCh with Back center channel");
+ return AVERROR_INVALIDDATA;
+ }
avctx->channel_layout |= AV_CH_BACK_CENTER;
if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
avctx->channel_layout |= AV_CH_BACK_CENTER;
if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY;