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 D9B964A521 for ; Fri, 29 Mar 2024 12:29:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98A4668D5FD; Fri, 29 Mar 2024 14:29:33 +0200 (EET) Received: from glom.nmugroup.com (glom.nmugroup.com [193.183.80.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 480FF68D56D for ; Fri, 29 Mar 2024 14:29:27 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by glom.nmugroup.com (Postfix) with ESMTP id C2A3B5429B8F for ; Fri, 29 Mar 2024 13:29:26 +0100 (CET) Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (Authenticated sender: git01) by glom.nmugroup.com (Postfix) with ESMTPSA id 894385429B87 for ; Fri, 29 Mar 2024 13:29:26 +0100 (CET) Message-ID: From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Fri, 29 Mar 2024 13:29:25 +0100 In-Reply-To: <6e0b44bc6313c994833c2c7a6622e9d8c8fc324f.camel@haerdin.se> References: <6e0b44bc6313c994833c2c7a6622e9d8c8fc324f.camel@haerdin.se> Content-Type: multipart/mixed; boundary="=-Ezxu5KEG0qWL2fXpbWa0" User-Agent: Evolution 3.46.4-2 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 3/3] lavf/subtitles: Unfix ticket #5032 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: --=-Ezxu5KEG0qWL2fXpbWa0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Here's an alternative solution which maintains support for \r\r\n by peeking two bytes into the future. /Tomas --=-Ezxu5KEG0qWL2fXpbWa0 Content-Disposition: attachment; filename*0=0001-lavf-subtitles-Add-ff_text_peek_r16-accept-r-n-r-n-a.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-lavf-subtitles-Add-ff_text_peek_r16-accept-r-n-r-n-a.patch"; charset="UTF-8" RnJvbSBlZDZmMGIyZTZjOGU1MjU3NGZjZmRhYzczZmNmY2E1NjA0MzRjMDc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogVGh1LCAyOCBNYXIgMjAyNCAyMzozMDowNiArMDEwMApTdWJqZWN0 OiBbUEFUQ0hdIGxhdmYvc3VidGl0bGVzOiBBZGQgZmZfdGV4dF9wZWVrX3IxNigpLCBhY2NlcHQg XHIsIFxuLCBcclxuCiBhbmQgXHJcclxuIGxpbmUgZW5kaW5ncwoKLS0tCiBsaWJhdmZvcm1hdC9z dWJ0aXRsZXMuYyB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t CiBsaWJhdmZvcm1hdC9zdWJ0aXRsZXMuaCB8ICA1ICsrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDQ3 IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQv c3VidGl0bGVzLmMgYi9saWJhdmZvcm1hdC9zdWJ0aXRsZXMuYwppbmRleCBiZGE1NDlhYmQwLi4w MTE4N2RmNmFiIDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9zdWJ0aXRsZXMuYworKysgYi9saWJh dmZvcm1hdC9zdWJ0aXRsZXMuYwpAQCAtMjIsNiArMjIsNyBAQAogI2luY2x1ZGUgInN1YnRpdGxl cy5oIgogI2luY2x1ZGUgImF2aW9faW50ZXJuYWwuaCIKICNpbmNsdWRlICJsaWJhdnV0aWwvYXZz dHJpbmcuaCIKKyNpbmNsdWRlICJsaWJhdnV0aWwvaW50cmVhZHdyaXRlLmgiCiAKIHZvaWQgZmZf dGV4dF9pbml0X2F2aW8odm9pZCAqcywgRkZUZXh0UmVhZGVyICpyLCBBVklPQ29udGV4dCAqcGIp CiB7CkBAIC0xMDYsNiArMTA3LDQyIEBAIGludCBmZl90ZXh0X3BlZWtfcjgoRkZUZXh0UmVhZGVy ICpyKQogICAgIHJldHVybiBjOwogfQogCitpbnQgZmZfdGV4dF9wZWVrX3IxNihGRlRleHRSZWFk ZXIgKnIpCit7CisgICAgaW50IGMxLCBjMjsKKyAgICBpZiAoci0+YnVmX3BvcyA8IHItPmJ1Zl9s ZW4gLSAxKQorICAgICAgICByZXR1cm4gQVZfUkIxNigmci0+YnVmW3ItPmJ1Zl9wb3NdKTsKKwor ICAgIC8vIG1pc3Npbmcgb25lIG9yIHR3byBieXRlcworICAgIGMxID0gZmZfdGV4dF9yOChyKTsK KyAgICBpZiAoYXZpb19mZW9mKHItPnBiKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAo ci0+YnVmX3BvcyA9PSByLT5idWZfbGVuIC0gMSkgeworICAgICAgICAvLyBtaXNzaW5nIG9uZSBi eXRlCisgICAgICAgIHItPmJ1ZlswXSA9IHItPmJ1ZltyLT5idWZfcG9zXTsKKyAgICAgICAgci0+ YnVmWzFdID0gYzE7CisgICAgICAgIHItPmJ1Zl9wb3MgPSAwOworICAgICAgICByLT5idWZfbGVu ID0gMjsKKyAgICAgICAgcmV0dXJuIEFWX1JCMTYoci0+YnVmKTsKKyAgICB9CisKKyAgICAvLyBt aXNzaW5nIHR3byBieXRlcworICAgIGMyID0gZmZfdGV4dF9yOChyKTsKKyAgICBpZiAoYXZpb19m ZW9mKHItPnBiKSkgeworICAgICAgICByLT5idWZbMF0gPSBjMTsKKyAgICAgICAgci0+YnVmX3Bv cyA9IDA7CisgICAgICAgIHItPmJ1Zl9sZW4gPSAxOworICAgICAgICByZXR1cm4gMDsKKyAgICB9 CisKKyAgICByLT5idWZbMF0gPSBjMTsKKyAgICByLT5idWZbMV0gPSBjMjsKKyAgICByLT5idWZf cG9zID0gMDsKKyAgICByLT5idWZfbGVuID0gMjsKKyAgICByZXR1cm4gQVZfUkIxNihyLT5idWYp OworfQorCiBBVlBhY2tldCAqZmZfc3VidGl0bGVzX3F1ZXVlX2luc2VydChGRkRlbXV4U3VidGl0 bGVzUXVldWUgKnEsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB1 aW50OF90ICpldmVudCwgc2l6ZV90IGxlbiwgaW50IG1lcmdlKQogewpAQCAtNDU5LDEzICs0OTYs MTQgQEAgcHRyZGlmZl90IGZmX3N1YnRpdGxlc19yZWFkX2xpbmUoRkZUZXh0UmVhZGVyICp0ciwg Y2hhciAqYnVmLCBzaXplX3Qgc2l6ZSkKICAgICAgICAgYnVmW2N1cisrXSA9IGM7CiAgICAgICAg IGJ1ZltjdXJdID0gJ1wwJzsKICAgICB9Ci0gICAgLy8gZG9uJ3QgZWF0IFxuXG4KICAgICBpZiAo YyA9PSAnXHInKSB7Ci0gICAgICAgIC8vIHN1Yi90aWNrZXQ1MDMyLXJybi5zcnQgaGFzIFxyXHJc bgotICAgICAgICB3aGlsZSAoZmZfdGV4dF9wZWVrX3I4KHRyKSA9PSAnXHInKQotICAgICAgICAg ICAgZmZfdGV4dF9yOCh0cik7CiAgICAgICAgIGlmIChmZl90ZXh0X3BlZWtfcjgodHIpID09ICdc bicpCiAgICAgICAgICAgICBmZl90ZXh0X3I4KHRyKTsKKyAgICAgICAgZWxzZSBpZiAoZmZfdGV4 dF9wZWVrX3IxNih0cikgPT0gQVZfUkIxNigiXHJcbiIpKSB7CisgICAgICAgICAgICAvLyB0aWNr ZXQ1MDMyLXJybi5zcnQgaGFzIFxyXHJcbgorICAgICAgICAgICAgZmZfdGV4dF9yOCh0cik7Cisg ICAgICAgICAgICBmZl90ZXh0X3I4KHRyKTsKKyAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4g Y3VyOwogfQpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvc3VidGl0bGVzLmggYi9saWJhdmZvcm1h dC9zdWJ0aXRsZXMuaAppbmRleCA4ODY2NTY2M2M1Li4yYTkyMDQ0OTc2IDEwMDY0NAotLS0gYS9s aWJhdmZvcm1hdC9zdWJ0aXRsZXMuaAorKysgYi9saWJhdmZvcm1hdC9zdWJ0aXRsZXMuaApAQCAt OTQsNiArOTQsMTEgQEAgaW50IGZmX3RleHRfZW9mKEZGVGV4dFJlYWRlciAqcik7CiAgKi8KIGlu dCBmZl90ZXh0X3BlZWtfcjgoRkZUZXh0UmVhZGVyICpyKTsKIAorLyoqCisgKiBMaWtlIGZmX3Rl eHRfcGVla19yOCgpLCBidXQgcGVlayB0d28gYnl0ZXMgYW5kIHJldHVybiB0aGVtIGFzIGEgYmln LWVuZGlhbiBudW1iZXIuCisgKi8KK2ludCBmZl90ZXh0X3BlZWtfcjE2KEZGVGV4dFJlYWRlciAq cik7CisKIC8qKgogICogUmVhZCB0aGUgZ2l2ZW4gbnVtYmVyIG9mIGJ5dGVzIChpbiBVVEYtOCku IE9uIGVycm9yIG9yIEVPRiwgXDAgYnl0ZXMgYXJlCiAgKiB3cml0dGVuLgotLSAKMi4zOS4yCgo= --=-Ezxu5KEG0qWL2fXpbWa0 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". --=-Ezxu5KEG0qWL2fXpbWa0--