[vlc-commits] Revert "flac: fix extradata clamping check"

Rafaël Carré git at videolan.org
Wed Dec 11 17:43:37 CET 2013


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Dec 11 11:42:45 2013 -0500| [3c975c0fc60b59100642f2e1dfc627b250c96331] | committer: Rafaël Carré

Revert "flac: fix extradata clamping check"

This reverts commit 16e9999966c12f696de57b0e7e5c0f39d7b0f621.

We use short flac extra format if it does *not* start with the header.
Thus we need not to add ! in front of memcmp

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3c975c0fc60b59100642f2e1dfc627b250c96331
---

 modules/codec/flac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 9552acc..dcfbc3a 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -389,7 +389,7 @@ static void ProcessHeader( decoder_t *p_dec )
 
     if (i_extra > 42 && !memcmp(p_dec->fmt_in.p_extra, header, 4))
         i_extra = 42;
-    else if (i_extra > 34 && !memcmp(p_dec->fmt_in.p_extra, header, 4))
+    else if (i_extra > 34 && memcmp(p_dec->fmt_in.p_extra, header, 4))
         i_extra = 34;
 
     switch (i_extra) {



More information about the vlc-commits mailing list