Revert "deinterlace: add basic support for YUY2 and NV12 (fixes #2206)"

[vlc] / modules / demux / xiph.h

diff --git a/modules/demux/xiph.h b/modules/demux/xiph.h
index 885662e5b175aa0a5c1ad79fadeb4e3b4e9d1f51..7d244286bef989d294e82881836c4d4535cd1d42 100644 (file)
--- a/modules/demux/xiph.h
+++ b/modules/demux/xiph.h
@@ -60,7 +60,7 @@ static inline unsigned int xiph_CountHeaders( const void *extra, unsigned int i_
 static inline int xiph_SplitHeaders(unsigned packet_size[], void * packet[], unsigned *packet_count,
                                     unsigned extra_size, const void *extra)
 {
-    const uint8_t *current = extra;
+    const uint8_t *current = (const uint8_t *)extra;
     const uint8_t *end = &current[extra_size];
     if (extra_size < 1)
         return VLC_EGENERIC;
@@ -85,7 +85,7 @@ static inline int xiph_SplitHeaders(unsigned packet_size[], void * packet[], uns
     }
     else
     {
-        unsigned size = 0;
+        int size = 0;
         for (unsigned i = 0; i < count - 1; i++) {
             packet_size[i] = 0;
             for (;;) {