[FFmpeg-cvslog] avcodec/dca_core: always limit frame size to data size

foo86 git at videolan.org
Mon Oct 9 16:56:01 EEST 2017


ffmpeg | branch: master | foo86 <foobaz86 at gmail.com> | Mon Oct  9 16:26:06 2017 +0300| [73789b85a759f3874112618120194e1712d7adcd] | committer: foo86

avcodec/dca_core: always limit frame size to data size

Silences pointless error message when decoding DTS-in-WAV stream with
excessive frame size stored in header.

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

 libavcodec/dca_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c
index 6cb1f30a3c..accc5efd51 100644
--- a/libavcodec/dca_core.c
+++ b/libavcodec/dca_core.c
@@ -1816,7 +1816,7 @@ int ff_dca_core_parse(DCACoreDecoder *s, uint8_t *data, int size)
         return ret;
 
     // Workaround for DTS in WAV
-    if (s->frame_size > size && s->frame_size < size + 4)
+    if (s->frame_size > size)
         s->frame_size = size;
 
     if (ff_dca_seek_bits(&s->gb, s->frame_size * 8)) {



More information about the ffmpeg-cvslog mailing list