mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 19:30:05 +00:00
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>
This commit is contained in:
commit
9988899993
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user