> On Jun 21, 2025, at 10:18, Jack Lau <jacklau1222gm-at-gmail....@ffmpeg.org> > wrote: > > > >> On Jun 17, 2025, at 22:07, Jack Lau <jacklau122...@gmail.com >> <mailto:jacklau122...@gmail.com>> wrote: >> >> >> >>> On Jun 15, 2025, at 23:54, Andreas Rheinhardt >>> <andreas.rheinha...@outlook.com> wrote: >>> >>> Jack Lau via ffmpeg-devel: >>>> diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c >>>> index 86e8935fee..2a3905891d 100644 >>>> --- a/libavformat/tls_openssl.c >>>> +++ b/libavformat/tls_openssl.c >>>> @@ -415,7 +415,11 @@ error: >>>> */ >>>> static EVP_PKEY *pkey_from_pem_string(const char *pem_str, int is_priv) >>>> { >>>> +#if OPENSSL_VERSION_NUMBER < 0x10002000L /* OpenSSL 1.0.2 */ >>>> + BIO *mem = BIO_new_mem_buf((void *)pem_str, -1); >>>> +#else >>>> BIO *mem = BIO_new_mem_buf(pem_str, -1); >>>> +#endif >>>> if (!mem) { >>>> av_log(NULL, AV_LOG_ERROR, "BIO_new_mem_buf failed\n"); >>>> return NULL; >>>> @@ -445,7 +449,11 @@ static EVP_PKEY *pkey_from_pem_string(const char >>>> *pem_str, int is_priv) >>>> */ >>>> static X509 *cert_from_pem_string(const char *pem_str) >>>> { >>>> +#if OPENSSL_VERSION_NUMBER < 0x10002000L /* OpenSSL 1.0.2 */ >>>> + BIO *mem = BIO_new_mem_buf((void *)pem_str, -1); >>>> +#else >>>> BIO *mem = BIO_new_mem_buf(pem_str, -1); >>>> +#endif >>>> if (!mem) { >>>> av_log(NULL, AV_LOG_ERROR, "BIO_new_mem_buf failed\n"); >>>> return NULL; >>> >>> That's what I had in mind. >> Thanks for your review! >> If everything looks good, could you help merge this please? >>> >>> - Andreas >> Best regards >> Jack >>> >>> _______________________________________________ >>> ffmpeg-devel mailing list >>> ffmpeg-devel@ffmpeg.org <mailto:ffmpeg-devel@ffmpeg.org> >>> <mailto:ffmpeg-devel@ffmpeg.org> >>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>> >>> To unsubscribe, visit link above, or email >>> ffmpeg-devel-requ...@ffmpeg.org <mailto:ffmpeg-devel-requ...@ffmpeg.org> >>> <mailto:ffmpeg-devel-requ...@ffmpeg.org> with subject "unsubscribe”. > PING.
Applied, thanks. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org <mailto:ffmpeg-devel@ffmpeg.org> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org <mailto:ffmpeg-devel-requ...@ffmpeg.org> with > subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
