Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'

* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
  vc1: Fix the skip condition

Conflicts:
	libavcodec/vc1_parser.c

See: ede411dd03
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/vc1_parser.c

@@ -127,6 +127,7 @@ static int vc1_parse(AVCodecParserContext *s,
     uint8_t *unesc_buffer = vpc->unesc_buffer;
     size_t unesc_index = vpc->unesc_index;
     VC1ParseSearchState search_state = vpc->search_state;
+    int start_code_found;
     int next = END_NOT_FOUND;
     int i = vpc->bytes_to_skip;
 
@@ -137,8 +138,8 @@ static int vc1_parse(AVCodecParserContext *s,
         next = 0;
     }
     while (i < buf_size) {
-        int start_code_found = 0;
         uint8_t b;
+        start_code_found = 0;
         while (i < buf_size && unesc_index < UNESCAPED_THRESHOLD) {
             b = buf[i++];
             unesc_buffer[unesc_index++] = b;