Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'

[ffmpeg] / libavcodec / vc1_common.h

diff --git a/libavcodec/vc1_common.h b/libavcodec/vc1_common.h
index cd67b17d47e9bc52301510b889a99ef83ada60e0..b46c33f7e2febe4e2b87f0e295bd458d7c4e02d4 100644 (file)
--- a/libavcodec/vc1_common.h
+++ b/libavcodec/vc1_common.h
@@ -26,6 +26,7 @@
 #include <stdint.h>
 
 #include "libavutil/attributes.h"
+#include "internal.h"
 
 /** Markers used in VC-1 AP frame data */
 //@{
@@ -57,12 +58,9 @@ enum Profile {
  */
 static av_always_inline const uint8_t* find_next_marker(const uint8_t *src, const uint8_t *end)
 {
-    uint32_t mrk = 0xFFFFFFFF;
-
-    if (end-src < 4)
-        return end;
-    while (src < end) {
-        mrk = (mrk << 8) | *src++;
+    if (end - src >= 4) {
+        uint32_t mrk = 0xFFFFFFFF;
+        src = avpriv_find_start_code(src, end, &mrk);
         if (IS_MARKER(mrk))
             return src - 4;
     }