diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:22:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:37:07 +0200 |
| commit | 9988899993ee6c514749244ff47d43492c42f395 (patch) | |
| tree | ea289fb93cb930b4934c16daf642f1ed39ddeb64 | |
| parent | bf7ed956ffcd390b3f5ead2b36d47b068f89178f (diff) | |
| parent | 701e8b42e12ad625c64ceae2252acb1de390278c (diff) | |
| download | ffmpeg-9988899993ee6c514749244ff47d43492c42f395.tar.gz | |
Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'
* commit '701e8b42e12ad625c64ceae2252acb1de390278c':
vc-1: Optimise parser (with special attention to ARM)
Conflicts:
libavcodec/vc1_parser.c
See: a0d7f9ec9a10d935b83a47dbcb2cd85dcc007738
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vc1_parser.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index c68981fa30..8d058ad10d 100644 --- 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 |