citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

common\dynamic_library\ffmpeg.{cpp, h}: fix version check for av_opt_child_class_iterate

This commit is contained in:
SachinVin 2023-06-17 19:50:40 +05:30
parent 7e134421d5
commit 982c60c67c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/dynamic_library/ffmpeg.cpp
View File

@ -31,7 +31,7 @@ av_hwframe_ctx_init_func av_hwframe_ctx_init;
av_hwframe_get_buffer_func av_hwframe_get_buffer; av_hwframe_get_buffer_func av_hwframe_get_buffer;
av_hwframe_transfer_data_func av_hwframe_transfer_data; av_hwframe_transfer_data_func av_hwframe_transfer_data;
av_int_list_length_for_size_func av_int_list_length_for_size; av_int_list_length_for_size_func av_int_list_length_for_size;
#if LIBAVCODEC_VERSION_MAJOR >= 59 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 53, 100) // lavu 56.53.100
av_opt_child_class_iterate_func av_opt_child_class_iterate; av_opt_child_class_iterate_func av_opt_child_class_iterate;
#else #else
av_opt_child_class_next_func av_opt_child_class_next; av_opt_child_class_next_func av_opt_child_class_next;
@ -166,7 +166,7 @@ static bool LoadAVUtil() {
LOAD_SYMBOL(avutil, av_hwframe_get_buffer); LOAD_SYMBOL(avutil, av_hwframe_get_buffer);
LOAD_SYMBOL(avutil, av_hwframe_transfer_data); LOAD_SYMBOL(avutil, av_hwframe_transfer_data);
LOAD_SYMBOL(avutil, av_int_list_length_for_size); LOAD_SYMBOL(avutil, av_int_list_length_for_size);
#if LIBAVCODEC_VERSION_MAJOR >= 59 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 53, 100) // lavu 56.53.100
LOAD_SYMBOL(avutil, av_opt_child_class_iterate); LOAD_SYMBOL(avutil, av_opt_child_class_iterate);
#else #else
LOAD_SYMBOL(avutil, av_opt_child_class_next); LOAD_SYMBOL(avutil, av_opt_child_class_next);

4
src/common/dynamic_library/ffmpeg.h
View File

@ -47,7 +47,7 @@ typedef int (*av_hwframe_ctx_init_func)(AVBufferRef*);
typedef int (*av_hwframe_get_buffer_func)(AVBufferRef*, AVFrame*, int); typedef int (*av_hwframe_get_buffer_func)(AVBufferRef*, AVFrame*, int);
typedef int (*av_hwframe_transfer_data_func)(AVFrame*, const AVFrame*, int); typedef int (*av_hwframe_transfer_data_func)(AVFrame*, const AVFrame*, int);
typedef unsigned (*av_int_list_length_for_size_func)(unsigned, const void*, uint64_t); typedef unsigned (*av_int_list_length_for_size_func)(unsigned, const void*, uint64_t);
#if LIBAVCODEC_VERSION_MAJOR >= 59 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 53, 100) // lavu 56.53.100
typedef const AVClass* (*av_opt_child_class_iterate_func)(const AVClass*, void**); typedef const AVClass* (*av_opt_child_class_iterate_func)(const AVClass*, void**);
#else #else
typedef const AVClass* (*av_opt_child_class_next_func)(const AVClass*, const AVClass*); typedef const AVClass* (*av_opt_child_class_next_func)(const AVClass*, const AVClass*);
@ -85,7 +85,7 @@ extern av_hwframe_ctx_init_func av_hwframe_ctx_init;
extern av_hwframe_get_buffer_func av_hwframe_get_buffer; extern av_hwframe_get_buffer_func av_hwframe_get_buffer;
extern av_hwframe_transfer_data_func av_hwframe_transfer_data; extern av_hwframe_transfer_data_func av_hwframe_transfer_data;
extern av_int_list_length_for_size_func av_int_list_length_for_size; extern av_int_list_length_for_size_func av_int_list_length_for_size;
#if LIBAVCODEC_VERSION_MAJOR >= 59 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 53, 100) // lavu 56.53.100
extern av_opt_child_class_iterate_func av_opt_child_class_iterate; extern av_opt_child_class_iterate_func av_opt_child_class_iterate;
#else #else
extern av_opt_child_class_next_func av_opt_child_class_next; extern av_opt_child_class_next_func av_opt_child_class_next;