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 2674447E90 for ; Sat, 30 Dec 2023 21:26:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2281768CCCF; Sat, 30 Dec 2023 23:26:28 +0200 (EET) Received: from glom.nmugroup.com (glom.nmugroup.com [193.183.80.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C59268CAB8 for ; Sat, 30 Dec 2023 23:26:22 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by glom.nmugroup.com (Postfix) with ESMTP id A75A05428493 for ; Sat, 30 Dec 2023 22:26:21 +0100 (CET) Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (Authenticated sender: git01) by glom.nmugroup.com (Postfix) with ESMTPSA id 6A3BD5428441 for ; Sat, 30 Dec 2023 22:26:21 +0100 (CET) Message-ID: From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Sat, 30 Dec 2023 22:26:20 +0100 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-GDUualXYH+tNSLJZRULF" User-Agent: Evolution 3.46.4-2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 6/7] lavf/codec2: Silence warnings when either muxer/demuxer is disabled 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: --=-GDUualXYH+tNSLJZRULF Content-Type: text/plain Content-Transfer-Encoding: 7bit --=-GDUualXYH+tNSLJZRULF Content-Disposition: attachment; filename*0=0006-lavf-codec2-Silence-warnings-when-either-muxer-demux.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0006-lavf-codec2-Silence-warnings-when-either-muxer-demux.patch"; charset="UTF-8" RnJvbSBmNjRiNGE5MGVhMjI0MjFkYjQ5NGQ4N2Y1OTA0YWU4YzcyOTRjODcxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogV2VkLCAyNyBEZWMgMjAyMyAyMjo1MjoyNSArMDEwMApTdWJqZWN0 OiBbUEFUQ0ggNi83XSBsYXZmL2NvZGVjMjogU2lsZW5jZSB3YXJuaW5ncyB3aGVuIGVpdGhlciBt dXhlci9kZW11eGVyCiBpcyBkaXNhYmxlZAoKLS0tCiBsaWJhdmZvcm1hdC9jb2RlYzIuYyB8IDc2 ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGli YXZmb3JtYXQvY29kZWMyLmMgYi9saWJhdmZvcm1hdC9jb2RlYzIuYwppbmRleCA3NDQ3MTA5NzUy Li44ZmYxNGJjNzJhIDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9jb2RlYzIuYworKysgYi9saWJh dmZvcm1hdC9jb2RlYzIuYwpAQCAtNDksNiArNDksNyBAQCB0eXBlZGVmIHN0cnVjdCB7CiAgICAg aW50IGZyYW1lc19wZXJfcGFja2V0OwogfSBDb2RlYzJDb250ZXh0OwogCisjaWYgQ09ORklHX0NP REVDMl9ERU1VWEVSCiBzdGF0aWMgaW50IGNoZWNrX3ZlcnNpb24odWludDhfdCBtYWpvciwgdWlu dDhfdCBtaW5vcikgewogICAgIC8vbm8gLmMyIGZpbGVzIHByaW9yIHRvIDAuOCBvciBsYXRlciB0 aGFuIDEuWAogICAgIGlmIChtYWpvciA9PSBNSU5fTUFKT1JfVkVSU0lPTiAmJiBtaW5vciA8IE1J Tl9NSU5PUl9WRVJTSU9OKQpAQCAtNjksNyArNzAsOSBAQCBzdGF0aWMgaW50IGNvZGVjMl9wcm9i ZShjb25zdCBBVlByb2JlRGF0YSAqcCkKICAgICAvLzMyIGJpdHMgb2YgaWRlbnRpZmljYXRpb24g LT4gbG93IHNjb3JlCiAgICAgcmV0dXJuIEFWUFJPQkVfU0NPUkVfRVhURU5TSU9OICsgMTsKIH0K KyNlbmRpZgogCisjaWYgQ09ORklHX0NPREVDMl9ERU1VWEVSIHx8IENPTkZJR19DT0RFQzJSQVdf REVNVVhFUgogLy9NaW1pY3MgY29kZWMyX3NhbXBsZXNfcGVyX2ZyYW1lKCkKIHN0YXRpYyBpbnQg Y29kZWMyX21vZGVfZnJhbWVfc2l6ZShBVkZvcm1hdENvbnRleHQgKnMsIGludCBtb2RlKQogewpA QCAtMTYxLDYgKzE2NCw0MSBAQCBzdGF0aWMgaW50IGNvZGVjMl9yZWFkX2hlYWRlcl9jb21tb24o QVZGb3JtYXRDb250ZXh0ICpzLCBBVlN0cmVhbSAqc3QsIGludCBoZWFkZQogICAgIHJldHVybiAw OwogfQogCitzdGF0aWMgaW50IGNvZGVjMl9yZWFkX3BhY2tldChBVkZvcm1hdENvbnRleHQgKnMs IEFWUGFja2V0ICpwa3QpCit7CisgICAgQ29kZWMyQ29udGV4dCAqYzIgPSBzLT5wcml2X2RhdGE7 CisgICAgQVZTdHJlYW0gKnN0ID0gcy0+c3RyZWFtc1swXTsKKyAgICBpbnQgcmV0LCBzaXplLCBu LCBibG9ja19hbGlnbiwgZnJhbWVfc2l6ZTsKKworICAgIGJsb2NrX2FsaWduID0gc3QtPmNvZGVj cGFyLT5ibG9ja19hbGlnbjsKKyAgICBmcmFtZV9zaXplICA9IHN0LT5jb2RlY3Bhci0+ZnJhbWVf c2l6ZTsKKworICAgIGlmIChibG9ja19hbGlnbiA8PSAwIHx8IGZyYW1lX3NpemUgPD0gMCB8fCBj Mi0+ZnJhbWVzX3Blcl9wYWNrZXQgPD0gMCkgeworICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5W QUwpOworICAgIH0KKworICAgIC8vdHJ5IHRvIHJlYWQgZGVzaXJlZCBudW1iZXIgb2YgZnJhbWVz LCBjb21wdXRlIG4gZnJvbSB0byBhY3R1YWwgbnVtYmVyIG9mIGJ5dGVzIHJlYWQKKyAgICBzaXpl ID0gYzItPmZyYW1lc19wZXJfcGFja2V0ICogYmxvY2tfYWxpZ247CisgICAgcmV0ID0gYXZfZ2V0 X3BhY2tldChzLT5wYiwgcGt0LCBzaXplKTsKKyAgICBpZiAocmV0IDwgMCkgeworICAgICAgICBy ZXR1cm4gcmV0OworICAgIH0KKworICAgIC8vb25seSBzZXQgZHVyYXRpb24gLSBjb21wdXRlX3Br dF9maWVsZHMoKSBhbmQgZmZfcGNtX3JlYWRfc2VlaygpIHRha2VzIGNhcmUgb2YgZXZlcnl0aGlu ZyBlbHNlCisgICAgLy90ZXN0ZWQgYnkgc3BhbW1pbmcgdGhlIHNlZWsgZnVuY3Rpb25hbGl0eSBp biBmZnBsYXkKKyAgICBuID0gcmV0IC8gYmxvY2tfYWxpZ247CisgICAgcGt0LT5kdXJhdGlvbiA9 IG4gKiBmcmFtZV9zaXplOworCisgICAgLy91bi1tYXJrIHBhY2tldCBhcyBjb3JydXB0IGlmIHNp emUgaXMgYSBtdWx0aXBsZSBvZiBibG9ja19hbGlnbgorICAgIC8vdGhpcyBjYW4gaGFwcGVuIHdo ZW4gZnJhbWVzX3Blcl9wYWNrZXQgPiAxCisgICAgaWYgKHJldCAlIGJsb2NrX2FsaWduID09IDAp CisgICAgICAgIHBrdC0+ZmxhZ3MgJj0gfkFWX1BLVF9GTEFHX0NPUlJVUFQ7CisKKyAgICByZXR1 cm4gcmV0OworfQorI2VuZGlmCisKKyNpZiBDT05GSUdfQ09ERUMyX0RFTVVYRVIKIHN0YXRpYyBp bnQgY29kZWMyX3JlYWRfaGVhZGVyKEFWRm9ybWF0Q29udGV4dCAqcykKIHsKICAgICBBVlN0cmVh bSAqc3QgPSBhdmZvcm1hdF9uZXdfc3RyZWFtKHMsIE5VTEwpOwpAQCAtMTk3LDQwICsyMzUsOSBA QCBzdGF0aWMgaW50IGNvZGVjMl9yZWFkX2hlYWRlcihBVkZvcm1hdENvbnRleHQgKnMpCiAKICAg ICByZXR1cm4gY29kZWMyX3JlYWRfaGVhZGVyX2NvbW1vbihzLCBzdCwgQ09ERUMyX0hFQURFUl9T SVpFKTsKIH0KKyNlbmRpZgogCi1zdGF0aWMgaW50IGNvZGVjMl9yZWFkX3BhY2tldChBVkZvcm1h dENvbnRleHQgKnMsIEFWUGFja2V0ICpwa3QpCi17Ci0gICAgQ29kZWMyQ29udGV4dCAqYzIgPSBz LT5wcml2X2RhdGE7Ci0gICAgQVZTdHJlYW0gKnN0ID0gcy0+c3RyZWFtc1swXTsKLSAgICBpbnQg cmV0LCBzaXplLCBuLCBibG9ja19hbGlnbiwgZnJhbWVfc2l6ZTsKLQotICAgIGJsb2NrX2FsaWdu ID0gc3QtPmNvZGVjcGFyLT5ibG9ja19hbGlnbjsKLSAgICBmcmFtZV9zaXplICA9IHN0LT5jb2Rl Y3Bhci0+ZnJhbWVfc2l6ZTsKLQotICAgIGlmIChibG9ja19hbGlnbiA8PSAwIHx8IGZyYW1lX3Np emUgPD0gMCB8fCBjMi0+ZnJhbWVzX3Blcl9wYWNrZXQgPD0gMCkgewotICAgICAgICByZXR1cm4g QVZFUlJPUihFSU5WQUwpOwotICAgIH0KLQotICAgIC8vdHJ5IHRvIHJlYWQgZGVzaXJlZCBudW1i ZXIgb2YgZnJhbWVzLCBjb21wdXRlIG4gZnJvbSB0byBhY3R1YWwgbnVtYmVyIG9mIGJ5dGVzIHJl YWQKLSAgICBzaXplID0gYzItPmZyYW1lc19wZXJfcGFja2V0ICogYmxvY2tfYWxpZ247Ci0gICAg cmV0ID0gYXZfZ2V0X3BhY2tldChzLT5wYiwgcGt0LCBzaXplKTsKLSAgICBpZiAocmV0IDwgMCkg ewotICAgICAgICByZXR1cm4gcmV0OwotICAgIH0KLQotICAgIC8vb25seSBzZXQgZHVyYXRpb24g LSBjb21wdXRlX3BrdF9maWVsZHMoKSBhbmQgZmZfcGNtX3JlYWRfc2VlaygpIHRha2VzIGNhcmUg b2YgZXZlcnl0aGluZyBlbHNlCi0gICAgLy90ZXN0ZWQgYnkgc3BhbW1pbmcgdGhlIHNlZWsgZnVu Y3Rpb25hbGl0eSBpbiBmZnBsYXkKLSAgICBuID0gcmV0IC8gYmxvY2tfYWxpZ247Ci0gICAgcGt0 LT5kdXJhdGlvbiA9IG4gKiBmcmFtZV9zaXplOwotCi0gICAgLy91bi1tYXJrIHBhY2tldCBhcyBj b3JydXB0IGlmIHNpemUgaXMgYSBtdWx0aXBsZSBvZiBibG9ja19hbGlnbgotICAgIC8vdGhpcyBj YW4gaGFwcGVuIHdoZW4gZnJhbWVzX3Blcl9wYWNrZXQgPiAxCi0gICAgaWYgKHJldCAlIGJsb2Nr X2FsaWduID09IDApCi0gICAgICAgIHBrdC0+ZmxhZ3MgJj0gfkFWX1BLVF9GTEFHX0NPUlJVUFQ7 Ci0KLSAgICByZXR1cm4gcmV0OwotfQotCisjaWYgQ09ORklHX0NPREVDMl9NVVhFUgogc3RhdGlj IGludCBjb2RlYzJfd3JpdGVfaGVhZGVyKEFWRm9ybWF0Q29udGV4dCAqcykKIHsKICAgICBBVlN0 cmVhbSAqc3Q7CkBAIC0yNTMsNyArMjYwLDkgQEAgc3RhdGljIGludCBjb2RlYzJfd3JpdGVfaGVh ZGVyKEFWRm9ybWF0Q29udGV4dCAqcykKIAogICAgIHJldHVybiAwOwogfQorI2VuZGlmCiAKKyNp ZiBDT05GSUdfQ09ERUMyUkFXX0RFTVVYRVIKIHN0YXRpYyBpbnQgY29kZWMycmF3X3JlYWRfaGVh ZGVyKEFWRm9ybWF0Q29udGV4dCAqcykKIHsKICAgICBDb2RlYzJDb250ZXh0ICpjMiA9IHMtPnBy aXZfZGF0YTsKQEAgLTI4MCw2ICsyODksNyBAQCBzdGF0aWMgaW50IGNvZGVjMnJhd19yZWFkX2hl YWRlcihBVkZvcm1hdENvbnRleHQgKnMpCiAKICAgICByZXR1cm4gY29kZWMyX3JlYWRfaGVhZGVy X2NvbW1vbihzLCBzdCwgMCk7CiB9CisjZW5kaWYKIAogLy90cmFuc2NvZGluZyByZXBvcnQyMDc0 LmMyIHRvIHdhdiB3ZW50IGZyb20gNy4zOTFzIHRvIDUuMzIycyB3aXRoIC1mcmFtZXNfcGVyX3Bh Y2tldCAxMDAwIGNvbXBhcmVkIHRvIGRlZmF1bHQsIHNhbWUgc2hhMXN1bQogI2RlZmluZSBGUkFN RVNfUEVSX1BBQ0tFVCBcCi0tIAoyLjM5LjIKCg== --=-GDUualXYH+tNSLJZRULF 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". --=-GDUualXYH+tNSLJZRULF--