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. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
