From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4ED4145FC6 for ; Thu, 27 Apr 2023 18:29:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3948F68BF13; Thu, 27 Apr 2023 21:29:51 +0300 (EEST) Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9076768BD03 for ; Thu, 27 Apr 2023 21:29:44 +0300 (EEST) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-18f16a2c329so6157495fac.0 for ; Thu, 27 Apr 2023 11:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682620182; x=1685212182; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ojqEmI2bNuyDk/6R7uiFcpzQXEcB5cbe+rmTxYN31J4=; b=jMI8dsAC4A+c6UN86jcP6KLIZV60zIUSt2e+MMdpHi7E53p7Jy6N+Z6EwZTy/ayvFw 68X9Kebktsag4h5Tbknq0UjYw77xsJsS4bytXl+GoABfXvb1lPF9Dtu+fnXOstIIvczF EKAOLrMu/iB7HrjfaAdTcjSLMNtLz+mjOd60ZplL+VmguBNca5W8R/6aUfKrs4p3KZnj uHhqe6BQ89PG7GyV1TIyQ1DCBHKQVcyQka6iaxJxQkJrL5iR+q56Ep3LzHRmlrRrkeSp 52OA4ngt1yolSbDrNMJ8LIh94lg4wOlZBh6et2jA/W6Fc2ipl7a/Y/QINzZ0kz8ahQ+F KZ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682620182; x=1685212182; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ojqEmI2bNuyDk/6R7uiFcpzQXEcB5cbe+rmTxYN31J4=; b=RzHRe+5SiMnjpUi/dgj0l7rAlwXxiCnxK5kdxaI/qFAsFpjXAy/SwM94kilJRuGfG7 M1KYZhAiVs9pX+Wah6Y/pklX2Wb8TLCJBvCEcukiDL65ur5QflF78L6C8UX9HuNbV5Re JptmWC6UK6WrSQx1gLH9nNKgW5DgjzpS3MiPN/yFjgCDJiLAyLbUiydPkI+PXrlC+Gzp HMaV0BtG/8x/sgXh2W0ZqUngKyu5LJfeHP+ZOXGdvrx8ywQGlgW+4xUFShDYxqRE/dmE K/ffiuH3Zpu1f8qVoIFyOCfuK1Iuj7ZgW00ed3XgJ70U2h7TIV+tLtkpgCFiUlCfBEi2 YRBQ== X-Gm-Message-State: AC+VfDzZnpi+0PWApcUFNGj0+meI9v7Y6+6T0A4ODFUXxCA6sVnVWFab 24wzHkniS/eKAZLWLKyu2aBqFNzWjGs= X-Google-Smtp-Source: ACHHUZ7WJkr8ldc1WsSdQbEHs9UQqMsH6K4IZgiVd8sKBTOwMlm/Rv71NIAd86eez/DSDKrGiNe3Tw== X-Received: by 2002:a9d:5904:0:b0:6a4:42a4:3e69 with SMTP id t4-20020a9d5904000000b006a442a43e69mr2854702oth.15.1682620182367; Thu, 27 Apr 2023 11:29:42 -0700 (PDT) Received: from [192.168.0.15] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e21-20020a9d5615000000b006a662e9f074sm4615510oti.58.2023.04.27.11.29.41 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Apr 2023 11:29:41 -0700 (PDT) Message-ID: Date: Thu, 27 Apr 2023 15:29:43 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230427180851.92573-1-thilo.borgmann@mail.de> <20230427180851.92573-2-thilo.borgmann@mail.de> From: James Almer In-Reply-To: <20230427180851.92573-2-thilo.borgmann@mail.de> Subject: Re: [FFmpeg-devel] [PATCH 1/2] libavcodec/webp: add support for animated WebP decoding X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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-request@ffmpeg.org with subject "unsubscribe".