Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'

* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde': h264_parser: don't stop on SPS_EXT in split Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 940f5c08e5
parent 69b2d43d6a 1b66726906
commit 940f5c08e5
1 changed files with 4 additions and 2 deletions
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@ -528,8 +528,10 @@ static int h264_split(AVCodecContext *avctx,
         *     (state&0xFFFFFF1F) == 0x105) {
         *  }
         */
-        if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 &&
-            (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) {
+        if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x106 &&
+            (state & 0xFFFFFF1F) != 0x107 && (state & 0xFFFFFF1F) != 0x108 &&
+            (state & 0xFFFFFF1F) != 0x109 && (state & 0xFFFFFF1F) != 0x10d &&
+            (state & 0xFFFFFF1F) != 0x10f) {
            if (has_sps) {
                while (i > 4 && buf[i - 5] == 0)
                    i--;