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 A631A428D6 for ; Sat, 3 Sep 2022 16:21:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC8E268B9A3; Sat, 3 Sep 2022 19:21:51 +0300 (EEST) Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C81168B556 for ; Sat, 3 Sep 2022 19:21:45 +0300 (EEST) Received: by mail-yb1-f172.google.com with SMTP id 193so7189629ybc.10 for ; Sat, 03 Sep 2022 09:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=DXXF0jy+d22Cirswf7NF0nB+sOIp0ibeo+b62qHoDB0=; b=Mq4H99YxZE+i8CgTvZOBPJ+3DXAx9Tza4TFDNY1qEC99DqWGCefr5TW4nYLo/bI4W+ zl1X++IibbOPw8BYRyQRkARTnYp0NxiM0ya0bx+keWzF5HEliz1+GpbT2gIKABfITwhc v01+UCbab9LTF93q2Tqe8Mx78kOYGNK8asknvyFLJX8iv6xTErcAMrHaaBlrQEwlsTpE fmD5F7KPhiwILpl8EXpE+97pfHxzbMWeUe1VA3OMGzF7FVDg8flYBuCHUFsPMSoWlm+B /VZItAJDZiDiePCXDp1I/ca089HU6iZ6V3sSTWn3K2SZcGFalX/NYpxaY+nE4BOD9rO8 I7oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=DXXF0jy+d22Cirswf7NF0nB+sOIp0ibeo+b62qHoDB0=; b=nm62n92QBNuElJ/ISAwWTxMiAvGs66HYJV6FvpTTKbCHzUy/9Ip+wWkfg7rF2BaDyP e42r3KWdNL8WwA+bswXwX1CLQMp0MdMgMgKMm6rSq9ID5zOmecVnsEKh3kGI0f40DmHR r6Z5aNR2ZOwwOMKewVZJu1gzBNg4DXQlFRkUyYJ9RP86WzOMnosrrkGhZrMeaD6QarV/ Pe/fLO+pk25frqKamWPetfiir5/mQk2GqjGxqtK3QGTLAeiHRWM2tN0OCEHUJUBvpMLh CSush1EZ8GvzvEoEltDd43Ve2DfSib5NnsUlYALU1YWksSBea3DtgEQaObjZjRnQaCOK rcTQ== X-Gm-Message-State: ACgBeo0SklEy5egH/XqryKa76r7a2h+gwzGuDC4WPMjjscaRDWyyQjge VC0Na7CtI27e8vy7NnBGS+5nQORTksRfRyF+Z6SOkizT X-Google-Smtp-Source: AA6agR65sjvnL0oj/PefJfCG0v0A5pxkCkFbOHsp3siTquX98NAXYmyYhzbYGbBc+wnwyHqv8rCvQXBDc8IK6Ufv/SQ= X-Received: by 2002:a05:6902:10c3:b0:69a:ae8:1600 with SMTP id w3-20020a05690210c300b0069a0ae81600mr24166327ybu.227.1662222100816; Sat, 03 Sep 2022 09:21:40 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Sat, 3 Sep 2022 18:24:51 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000dbe28405e7c83d82" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] speexdec fix 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000dbe28405e7c83d82 Content-Type: text/plain; charset="UTF-8" Patch attached. --000000000000dbe28405e7c83d82 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avcodec-speexdec-improve-support-for-speex-in-non-og.patch" Content-Disposition: attachment; filename="0001-avcodec-speexdec-improve-support-for-speex-in-non-og.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l7m47pjq0 RnJvbSA2YTkwZTVkNTgyYmEyZmMzYTA4ZmIwOGZiMWI1ZjNmMzhkMzE1YjNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFNhdCwgMyBTZXAgMjAyMiAxODoxNzoyMyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIGF2Y29kZWMv c3BlZXhkZWM6IGltcHJvdmUgc3VwcG9ydCBmb3Igc3BlZXggaW4gbm9uLW9nZwoKU2lnbmVkLW9m Zi1ieTogUGF1bCBCIE1haG9sIDxvbmVtZGFAZ21haWwuY29tPgotLS0KIGxpYmF2Y29kZWMvc3Bl ZXhkZWMuYyB8IDE2ICsrKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvc3BlZXhkZWMu YyBiL2xpYmF2Y29kZWMvc3BlZXhkZWMuYwppbmRleCA4Mzk4MWZjNDU0Li45NzkzZDkzOWZjIDEw MDY0NAotLS0gYS9saWJhdmNvZGVjL3NwZWV4ZGVjLmMKKysrIGIvbGliYXZjb2RlYy9zcGVleGRl Yy5jCkBAIC0xNDYyLDcgKzE0NjIsNyBAQCBzdGF0aWMgYXZfY29sZCBpbnQgc3BlZXhfZGVjb2Rl X2luaXQoQVZDb2RlY0NvbnRleHQgKmF2Y3R4KQogICAgICAgICBkZWZhdWx0OiBzLT5tb2RlID0g MjsKICAgICAgICAgfQogCi0gICAgICAgIHMtPmZyYW1lc19wZXJfcGFja2V0ID0gMTsKKyAgICAg ICAgcy0+ZnJhbWVzX3Blcl9wYWNrZXQgPSA2NDsKICAgICAgICAgcy0+ZnJhbWVfc2l6ZSA9IE5C X0ZSQU1FX1NJWkUgPDwgcy0+bW9kZTsKICAgICB9CiAKQEAgLTE1MzcsNiArMTUzNyw3IEBAIHN0 YXRpYyBpbnQgc3BlZXhfZGVjb2RlX2ZyYW1lKEFWQ29kZWNDb250ZXh0ICphdmN0eCwgQVZGcmFt ZSAqZnJhbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgKmdvdF9mcmFtZV9w dHIsIEFWUGFja2V0ICphdnBrdCkKIHsKICAgICBTcGVleENvbnRleHQgKnMgPSBhdmN0eC0+cHJp dl9kYXRhOworICAgIGludCBmcmFtZXNfcGVyX3BhY2tldCA9IHMtPmZyYW1lc19wZXJfcGFja2V0 OwogICAgIGNvbnN0IGZsb2F0IHNjYWxlID0gMS5mIC8gMzI3NjguZjsKICAgICBpbnQgYnVmX3Np emUgPSBhdnBrdC0+c2l6ZTsKICAgICBmbG9hdCAqZHN0OwpAQCAtMTU0NywyNiArMTU0OCwzMSBA QCBzdGF0aWMgaW50IHNwZWV4X2RlY29kZV9mcmFtZShBVkNvZGVjQ29udGV4dCAqYXZjdHgsIEFW RnJhbWUgKmZyYW1lLAogICAgIGlmICgocmV0ID0gaW5pdF9nZXRfYml0czgoJnMtPmdiLCBhdnBr dC0+ZGF0YSwgYnVmX3NpemUpKSA8IDApCiAgICAgICAgIHJldHVybiByZXQ7CiAKLSAgICBmcmFt ZS0+bmJfc2FtcGxlcyA9IEZGQUxJR04ocy0+ZnJhbWVfc2l6ZSAqIHMtPmZyYW1lc19wZXJfcGFj a2V0LCA0KTsKKyAgICBmcmFtZS0+bmJfc2FtcGxlcyA9IEZGQUxJR04ocy0+ZnJhbWVfc2l6ZSAq IGZyYW1lc19wZXJfcGFja2V0LCA0KTsKICAgICBpZiAoKHJldCA9IGZmX2dldF9idWZmZXIoYXZj dHgsIGZyYW1lLCAwKSkgPCAwKQogICAgICAgICByZXR1cm4gcmV0OwogCiAgICAgZHN0ID0gKGZs b2F0ICopZnJhbWUtPmV4dGVuZGVkX2RhdGFbMF07Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBz LT5mcmFtZXNfcGVyX3BhY2tldDsgaSsrKSB7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBmcmFt ZXNfcGVyX3BhY2tldDsgaSsrKSB7CiAgICAgICAgIHJldCA9IHNwZWV4X21vZGVzW3MtPm1vZGVd LmRlY29kZShhdmN0eCwgJnMtPnN0W3MtPm1vZGVdLCAmcy0+Z2IsIGRzdCArIGkgKiBzLT5mcmFt ZV9zaXplKTsKICAgICAgICAgaWYgKHJldCA8IDApCiAgICAgICAgICAgICByZXR1cm4gcmV0Owog ICAgICAgICBpZiAoYXZjdHgtPmNoX2xheW91dC5uYl9jaGFubmVscyA9PSAyKQogICAgICAgICAg ICAgc3BlZXhfZGVjb2RlX3N0ZXJlbyhkc3QgKyBpICogcy0+ZnJhbWVfc2l6ZSwgcy0+ZnJhbWVf c2l6ZSwgJnMtPnN0ZXJlbyk7CisgICAgICAgIGlmIChnZXRfYml0c19sZWZ0KCZzLT5nYikgPCA1 IHx8CisgICAgICAgICAgICBzaG93X2JpdHMoJnMtPmdiLCA1KSA9PSAxNSkgeworICAgICAgICAg ICAgZnJhbWVzX3Blcl9wYWNrZXQgPSBpICsgMTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CiAgICAgfQogCiAgICAgZHN0ID0gKGZsb2F0ICopZnJhbWUtPmV4dGVuZGVkX2RhdGFbMF07 CiAgICAgcy0+ZmRzcC0+dmVjdG9yX2ZtdWxfc2NhbGFyKGRzdCwgZHN0LCBzY2FsZSwgZnJhbWUt Pm5iX3NhbXBsZXMgKiBmcmFtZS0+Y2hfbGF5b3V0Lm5iX2NoYW5uZWxzKTsKLSAgICBmcmFtZS0+ bmJfc2FtcGxlcyA9IHMtPmZyYW1lX3NpemUgKiBzLT5mcmFtZXNfcGVyX3BhY2tldDsKKyAgICBm cmFtZS0+bmJfc2FtcGxlcyA9IHMtPmZyYW1lX3NpemUgKiBmcmFtZXNfcGVyX3BhY2tldDsKIAog ICAgICpnb3RfZnJhbWVfcHRyID0gMTsKIAotICAgIHJldHVybiBidWZfc2l6ZTsKKyAgICByZXR1 cm4gKGdldF9iaXRzX2NvdW50KCZzLT5nYikgKyA3KSA+PiAzOwogfQogCiBzdGF0aWMgYXZfY29s ZCBpbnQgc3BlZXhfZGVjb2RlX2Nsb3NlKEFWQ29kZWNDb250ZXh0ICphdmN0eCkKLS0gCjIuMzcu MgoK --000000000000dbe28405e7c83d82 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --000000000000dbe28405e7c83d82--