RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: deprecate av_format_inject_global_side_data() 

This function would otherwise fail to build on the next major bump, as
inject_global_side_data is marked for removal.

It should also never be needed, as there is now a mechanism for
supplying global side data to decoders directly.
This commit is contained in:
Anton Khirnov 2024-10-13 12:21:37 +02:00
parent cb80ec0b6c
commit 12e5116872
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avformat.h
View File

@ -1929,6 +1929,7 @@ typedef struct AVFormatContext {
int64_t duration_probesize; int64_t duration_probesize;
} AVFormatContext; } AVFormatContext;
#if FF_API_AVSTREAM_SIDE_DATA
/** /**
* This function will cause global side data to be injected in the next packet * This function will cause global side data to be injected in the next packet
* of each stream as well as after any subsequent seek. * of each stream as well as after any subsequent seek.
@ -1938,8 +1939,15 @@ typedef struct AVFormatContext {
* in a @ref AVCodecContext.coded_side_data "decoder's side data" array if * in a @ref AVCodecContext.coded_side_data "decoder's side data" array if
* initialized with said stream's codecpar. * initialized with said stream's codecpar.
* @see av_packet_side_data_get() * @see av_packet_side_data_get()
*
* @deprecated this function should never be needed, as global side data is now
* exported in AVCodecParameters and should
* be propagated from demuxers to decoders via
* ::avcodec_parameters_to_context()
*/ */
attribute_deprecated
void av_format_inject_global_side_data(AVFormatContext *s); void av_format_inject_global_side_data(AVFormatContext *s);
#endif
#if FF_API_GET_DUR_ESTIMATE_METHOD #if FF_API_GET_DUR_ESTIMATE_METHOD
/** /**

2
libavformat/demux_utils.c
View File

@ -81,6 +81,7 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba
return chapter; return chapter;
} }
#if FF_API_AVSTREAM_SIDE_DATA
void av_format_inject_global_side_data(AVFormatContext *s) void av_format_inject_global_side_data(AVFormatContext *s)
{ {
FFFormatContext *const si = ffformatcontext(s); FFFormatContext *const si = ffformatcontext(s);
@ -90,6 +91,7 @@ void av_format_inject_global_side_data(AVFormatContext *s)
ffstream(st)->inject_global_side_data = 1; ffstream(st)->inject_global_side_data = 1;
} }
} }
#endif
int avformat_queue_attached_pictures(AVFormatContext *s) int avformat_queue_attached_pictures(AVFormatContext *s)
{ {