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 7987C4C572 for ; Mon, 29 Jul 2024 17:19:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB36968D6D2; Mon, 29 Jul 2024 20:19:51 +0300 (EEST) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85B7C68D0D3 for ; Mon, 29 Jul 2024 20:19:45 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-44fee2bfd28so17261cf.1 for ; Mon, 29 Jul 2024 10:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722273584; x=1722878384; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Wm6NfdJB2qjiIHJEHwe2faG3ezfFFY4S1TAwAgnI5fQ=; b=Y615MQp7XWHMNLnKMf9smZk/P6V1pu1a5s5ThlEvLeqD3em8oZi/FMaIev4LgN1ZEQ s0EgIDBzxV2dayP3K6rnw8/F63t8MrFBQBlvEQJhMhp42GGvZN6CIF0OHR6A4AzvoWEo vjmLrMNbby6+8KwpR7BWL6rvXyiCOD7bBsASc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722273584; x=1722878384; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Wm6NfdJB2qjiIHJEHwe2faG3ezfFFY4S1TAwAgnI5fQ=; b=AmQw9OVm6GnTywMF9iys3XyBGRz63BX4qGEIXrgBb3spL17ns1m58XiqreAwJVcPdL HQapjBrLgx3wPizkB1gv2r2DhAvCWgmebcRbG9P0/rUUHEmaTEESN2cpT5jKC7zV71sx 4TVhVFm+cGvvomiA/hb+CnfTIJnANSG0y8bMbX6MlHEF/Sj72WenHU8R1AdUqUbNt3k8 AzjOXtIMXiLqUo9IELuzeUzAAvN34CxRLLfNrR4hw3Q2dQVP1eWHEisIK68Kj12ttwII 64rCBByrW6NR+llSujFaQXVa9u94rKLDt8Nzh/CctOZS/HGQUE1Ce3T01n50VEaVAgEc DD8A== X-Gm-Message-State: AOJu0YwuIvMm4rLF35OcT8JY4/CB6Zd+0Ritt8I/1Oo1NZbM5hv0p5/5 O15yUykEqk9/S7LgDsF1WCM+X0/xM9r8GEObzMIlGxtOn5uJLWIHBYGnFjnX18pmWXo3U7vUEZf 0dMyNrlZg166dGPKXGVMrHzwR3p2XqW543TvCn0IF1Sqj6ceN6Tc8 X-Google-Smtp-Source: AGHT+IHkbSCewm3RQBXcbASDQ3GWiect1QGQJQqJ/yp0sTarluOahTzFvIr4kTrF6SIwjlT6foDjDqnFoYpqlXvYIuw= X-Received: by 2002:a05:622a:14cf:b0:447:e01a:de95 with SMTP id d75a77b69052e-450327295ecmr689401cf.0.1722273583408; Mon, 29 Jul 2024 10:19:43 -0700 (PDT) MIME-Version: 1.0 From: Dale Curtis Date: Mon, 29 Jul 2024 10:19:28 -0700 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="00000000000026169f061e6611fb" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] Check codec_whitelist before reinitializing AVCtx.priv_data. 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: --00000000000026169f061e6611fb Content-Type: text/plain; charset="UTF-8" This ensures that if a codec isn't on codec_whitelist, its VUI information can still be populated during find_stream_info() via parsers. Signed-off-by: Dale Curtis --- libavcodec/avcodec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --00000000000026169f061e6611fb Content-Type: application/octet-stream; name="no_reinit.patch" Content-Disposition: attachment; filename="no_reinit.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lz797dra0 RnJvbSA1M2Q3NGU2YTBmNjU4OWFjOTFlZGE0ZDMyZWUyNmNiZmJlYzRiMjRhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYWxlIEN1cnRpcyA8ZGFsZWN1cnRpc0BjaHJvbWl1bS5vcmc+ CkRhdGU6IE1vbiwgMjkgSnVsIDIwMjQgMTc6MTQ6MzEgKzAwMDAKU3ViamVjdDogW1BBVENIXSBD aGVjayBjb2RlY193aGl0ZWxpc3QgYmVmb3JlIHJlaW5pdGlhbGl6aW5nIEFWQ3R4LnByaXZfZGF0 YS4KClRoaXMgZW5zdXJlcyB0aGF0IGlmIGEgY29kZWMgaXNuJ3Qgb24gY29kZWNfd2hpdGVsaXN0 LCBpdHMgVlVJCmluZm9ybWF0aW9uIGNhbiBzdGlsbCBiZSBwb3B1bGF0ZWQgZHVyaW5nIGZpbmRf c3RyZWFtX2luZm8oKQp2aWEgcGFyc2Vycy4KClNpZ25lZC1vZmYtYnk6IERhbGUgQ3VydGlzIDxk YWxlY3VydGlzQGNocm9taXVtLm9yZz4KLS0tCiBsaWJhdmNvZGVjL2F2Y29kZWMuYyB8IDEyICsr KysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2F2Y29kZWMuYyBiL2xpYmF2Y29kZWMvYXZjb2Rl Yy5jCmluZGV4IDIxNGRjYTQ1NjYuLjE4MmE3Mjc2NzMgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMv YXZjb2RlYy5jCisrKyBiL2xpYmF2Y29kZWMvYXZjb2RlYy5jCkBAIC0xOTAsNiArMTkwLDEyIEBA IGludCBhdHRyaWJ1dGVfYWxpZ25fYXJnIGF2Y29kZWNfb3BlbjIoQVZDb2RlY0NvbnRleHQgKmF2 Y3R4LCBjb25zdCBBVkNvZGVjICpjb2RlCiAgICAgICAgIGdvdG8gZnJlZV9hbmRfZW5kOwogICAg IH0KIAorICAgIGlmIChhdmN0eC0+Y29kZWNfd2hpdGVsaXN0ICYmIGF2X21hdGNoX2xpc3QoY29k ZWMtPm5hbWUsIGF2Y3R4LT5jb2RlY193aGl0ZWxpc3QsICcsJykgPD0gMCkgeworICAgICAgICBh dl9sb2coYXZjdHgsIEFWX0xPR19FUlJPUiwgIkNvZGVjICglcykgbm90IG9uIHdoaXRlbGlzdCBc JyVzXCdcbiIsIGNvZGVjLT5uYW1lLCBhdmN0eC0+Y29kZWNfd2hpdGVsaXN0KTsKKyAgICAgICAg cmV0ID0gQVZFUlJPUihFSU5WQUwpOworICAgICAgICBnb3RvIGZyZWVfYW5kX2VuZDsKKyAgICB9 CisKICAgICBpZiAoY29kZWMyLT5wcml2X2RhdGFfc2l6ZSA+IDApIHsKICAgICAgICAgaWYgKCFh dmN0eC0+cHJpdl9kYXRhKSB7CiAgICAgICAgICAgICBhdmN0eC0+cHJpdl9kYXRhID0gYXZfbWFs bG9jeihjb2RlYzItPnByaXZfZGF0YV9zaXplKTsKQEAgLTIxMCwxMiArMjE2LDYgQEAgaW50IGF0 dHJpYnV0ZV9hbGlnbl9hcmcgYXZjb2RlY19vcGVuMihBVkNvZGVjQ29udGV4dCAqYXZjdHgsIGNv bnN0IEFWQ29kZWMgKmNvZGUKICAgICBpZiAoKHJldCA9IGF2X29wdF9zZXRfZGljdChhdmN0eCwg b3B0aW9ucykpIDwgMCkKICAgICAgICAgZ290byBmcmVlX2FuZF9lbmQ7CiAKLSAgICBpZiAoYXZj dHgtPmNvZGVjX3doaXRlbGlzdCAmJiBhdl9tYXRjaF9saXN0KGNvZGVjLT5uYW1lLCBhdmN0eC0+ Y29kZWNfd2hpdGVsaXN0LCAnLCcpIDw9IDApIHsKLSAgICAgICAgYXZfbG9nKGF2Y3R4LCBBVl9M T0dfRVJST1IsICJDb2RlYyAoJXMpIG5vdCBvbiB3aGl0ZWxpc3QgXCclc1wnXG4iLCBjb2RlYy0+ bmFtZSwgYXZjdHgtPmNvZGVjX3doaXRlbGlzdCk7Ci0gICAgICAgIHJldCA9IEFWRVJST1IoRUlO VkFMKTsKLSAgICAgICAgZ290byBmcmVlX2FuZF9lbmQ7Ci0gICAgfQotCiAgICAgLy8gb25seSBj YWxsIGZmX3NldF9kaW1lbnNpb25zKCkgZm9yIG5vbiBILjI2NC9WUDZGL0RYViBjb2RlY3Mgc28g YXMgbm90IHRvIG92ZXJ3cml0ZSBwcmV2aW91c2x5IHNldHVwIGRpbWVuc2lvbnMKICAgICBpZiAo IShhdmN0eC0+Y29kZWRfd2lkdGggJiYgYXZjdHgtPmNvZGVkX2hlaWdodCAmJiBhdmN0eC0+d2lk dGggJiYgYXZjdHgtPmhlaWdodCAmJgogICAgICAgICAgIChhdmN0eC0+Y29kZWNfaWQgPT0gQVZf Q09ERUNfSURfSDI2NCB8fCBhdmN0eC0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfVlA2RiB8fCBh dmN0eC0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfRFhWKSkpIHsKLS0gCjIuNDYuMC5yYzEuMjMy Lmc5NzUyZjllMTIzLWdvb2cKCg== --00000000000026169f061e6611fb 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". --00000000000026169f061e6611fb--