[vlc-devel] [PATCH] Allow the image separator to be specified on the command line

David R Robison drrobison at openroadsconsulting.com
Tue Aug 27 03:15:46 CEST 2013


Hmm. looks like my conditionals were off. This is now working. How does 
it look to everyone else?

---
  modules/demux/mjpeg.c |   12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
  mode change 100644 => 100755 modules/demux/mjpeg.c

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
old mode 100644
new mode 100755
index 8def7f8..1e6a44d
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -508,7 +508,11 @@ static int MimeDemux( demux_t *p_demux )
              }
          }

-        if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i 
+ 2),
+        if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i 
+ 2),
+                      strlen( p_sys->psz_separator ) )
+                      || (strlen( p_sys->psz_separator ) <= 4)
+                      || !strncmp(p_sys->psz_separator, "--", 2)
+                      || !strncmp( p_sys->psz_separator, (char 
*)(p_sys->p_peek + i),
                        strlen( p_sys->psz_separator ) ) )
          {
              break;
-- 
1.7.9.5



This email communication (including any attachments) may contain confidential and/or privileged material intended solely for the individual or entity to which it is addressed.
If you are not the intended recipient, please delete this email immediately.




More information about the vlc-devel mailing list