Mercurial > libavcodec.hg

changeset 6577:1b90003d4d60 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only set channels in the stream if previously unset, fixes resampling crash on broken dca frames
author banan
date Thu, 10 Apr 2008 06:15:17 +0000
parents 5e7c69ebc019
children dfa423a2fc78
files dca.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dca.c	Wed Apr 09 22:11:21 2008 +0000
+++ b/dca.c	Thu Apr 10 06:15:17 2008 +0000
@@ -1173,7 +1173,14 @@
         s->output = DCA_STEREO;
     }
 
-    avctx->channels = channels;
+    /* There is nothing that prevents a dts frame to change channel configuration
+       but FFmpeg doesn't support that so only set the channels if it is previously
+       unset. Ideally during the first probe for channels the crc should be checked
+       and only set avctx->channels when the crc is ok. Right now the decoder could
+       set the channels based on a broken first frame.*/
+    if (!avctx->channels)
+        avctx->channels = channels;
+
     if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
         return -1;
     *data_size = 0;