Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'

* commit '701e8b42e12ad625c64ceae2252acb1de390278c': vc-1: Optimise parser (with special attention to ARM) Conflicts: libavcodec/vc1_parser.c See: a0d7f9ec9a Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 9988899993
parent bf7ed956ff 701e8b42e1
commit 9988899993
1 changed files with 0 additions and 2 deletions
--- a/libavcodec/vc1_parser.c
+++ b/libavcodec/vc1_parser.c
@ -228,8 +228,6 @@ static int vc1_parse(AVCodecParserContext *s,
        }
    }

-    vpc->v.first_pic_header_flag = 1;
-
    /* If we return with a valid pointer to a combined frame buffer
     * then on the next call then we'll have been unhelpfully rewound
     * by up to 4 bytes (depending upon whether the start code