-
Michael Niedermayer authored
* commit 'a4d3c200': vc1: Fix the skip condition Conflicts: libavcodec/vc1_parser.c See: ede411ddMerged-by: Michael Niedermayer <michaelni@gmx.at>
ba650ea1
* commit 'a4d3c200': vc1: Fix the skip condition Conflicts: libavcodec/vc1_parser.c See: ede411ddMerged-by: Michael Niedermayer <michaelni@gmx.at>