Commit 99888999 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '701e8b42'

* commit '701e8b42':
  vc-1: Optimise parser (with special attention to ARM)

Conflicts:
	libavcodec/vc1_parser.c

See: a0d7f9ecMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bf7ed956 701e8b42
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment