[FFmpeg-cvslog] Fix dca decoding for many samples after last commit.

Carl Eugen Hoyos git at videolan.org
Fri Oct 28 19:15:45 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Oct 28 19:13:59 2011 +0200| [246c8dac3e12887ec90c6eae29bf26aee6dc6ac0] | committer: Carl Eugen Hoyos

Fix dca decoding for many samples after last commit.

Still be less verbose about channel count change from 0 channels.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=246c8dac3e12887ec90c6eae29bf26aee6dc6ac0
---

 libavcodec/dca.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index ddd2be9..5cf5b26 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1815,8 +1815,9 @@ static int dca_decode_frame(AVCodecContext * avctx,
         return -1;
     }
 
-    if (avctx->channels && avctx->channels != channels) {
-        av_log(avctx, AV_LOG_INFO, "Number of channels changed in DCA decoder (%d -> %d)\n", avctx->channels, channels);
+    if (avctx->channels != channels) {
+        if (avctx->channels)
+            av_log(avctx, AV_LOG_INFO, "Number of channels changed in DCA decoder (%d -> %d)\n", avctx->channels, channels);
         avctx->channels = channels;
     }
 



More information about the ffmpeg-cvslog mailing list