[FFmpeg-devel] [PATCH 1/2] libavcodec/webp: add support for animated WebP decoding

Thilo Borgmann thilo.borgmann at mail.de
Thu Apr 27 21:48:37 EEST 2023


Am 27.04.23 um 20:29 schrieb James Almer:
> On 4/27/2023 3:08 PM, Thilo Borgmann wrote:
>> +static int decode_frame_common(AVCodecContext *avctx, uint8_t *data, int size,
>> +                               int *got_frame, int key_frame)
>> +//>>>>>>> f95bfa9c6d (libavcodec/webp: add support for animated WebP decoding)
> 
> ???
> 
> There's several of these in the patch.

Ups, rebase cruft. Fixed locally, thx!

-Thilo



More information about the ffmpeg-devel mailing list