[FFmpeg-cvslog] avcodec/wavpack: Move initializing DSD data to a better place

Andreas Rheinhardt git at videolan.org
Fri Apr 19 14:53:41 EEST 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Apr  7 10:02:42 2024 +0200| [8dd0bd4f9b8de59c2731215f1611f337a19474cb] | committer: Andreas Rheinhardt

avcodec/wavpack: Move initializing DSD data to a better place

Namely to code that is only executed if we are indeed
initializing a DSD context.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/wavpack.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 83f42f392d..6fd297a002 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -1011,6 +1011,8 @@ static int wv_dsd_reset(WavpackContext *s, int channels)
     for (i = 0; i < channels; i++)
         memset(s->dsdctx[i].buf, 0x69, sizeof(s->dsdctx[i].buf));
 
+    ff_init_dsd_data();
+
     return 0;
 }
 
@@ -1533,7 +1535,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, AVFrame *frame, int block
                 av_log(avctx, AV_LOG_ERROR, "Error reinitializing the DSD context\n");
                 return ret;
             }
-            ff_init_dsd_data();
         }
         av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout);
         avctx->sample_rate         = new_samplerate;



More information about the ffmpeg-cvslog mailing list