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.
Unified · Split
| @@ -1929,6 +1929,7 @@ typedef struct AVFormatContext { · 1928 unmodified lines | |||
| 1929 | int64_t duration_probesize; | 1929 | int64_t duration_probesize; |
| 1930 | } AVFormatContext; | 1930 | } AVFormatContext; |
| 1931 | 1931 | ||
| 1932 | #if FF_API_AVSTREAM_SIDE_DATA | ||
| 1932 | /** | 1933 | /** |
| 1933 | * This function will cause global side data to be injected in the next packet | 1934 | * This function will cause global side data to be injected in the next packet |
| 1934 | * of each stream as well as after any subsequent seek. | 1935 | * of each stream as well as after any subsequent seek. |
| @@ -1938,8 +1939,15 @@ typedef struct AVFormatContext { · 3 unmodified lines | |||
| 1938 | * in a @ref AVCodecContext.coded_side_data "decoder's side data" array if | 1939 | * in a @ref AVCodecContext.coded_side_data "decoder's side data" array if |
| 1939 | * initialized with said stream's codecpar. | 1940 | * initialized with said stream's codecpar. |
| 1940 | * @see av_packet_side_data_get() | 1941 | * @see av_packet_side_data_get() |
| 1942 | * | ||
| 1943 | * @deprecated this function should never be needed, as global side data is now | ||
| 1944 | * exported in AVCodecParameters and should | ||
| 1945 | * be propagated from demuxers to decoders via | ||
| 1946 | * ::avcodec_parameters_to_context() | ||
| 1941 | */ | 1947 | */ |
| 1948 | attribute_deprecated | ||
| 1942 | void av_format_inject_global_side_data(AVFormatContext *s); | 1949 | void av_format_inject_global_side_data(AVFormatContext *s); |
| 1950 | #endif | ||
| 1943 | 1951 | ||
| 1944 | #if FF_API_GET_DUR_ESTIMATE_METHOD | 1952 | #if FF_API_GET_DUR_ESTIMATE_METHOD |
| 1945 | /** | 1953 | /** |
| @@ -81,6 +81,7 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba · 80 unmodified lines | |||
| 81 | return chapter; | 81 | return chapter; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | #if FF_API_AVSTREAM_SIDE_DATA | ||
| 84 | void av_format_inject_global_side_data(AVFormatContext *s) | 85 | void av_format_inject_global_side_data(AVFormatContext *s) |
| 85 | { | 86 | { |
| 86 | FFFormatContext *const si = ffformatcontext(s); | 87 | FFFormatContext *const si = ffformatcontext(s); |
| @@ -90,6 +91,7 @@ void av_format_inject_global_side_data(AVFormatContext *s) · 3 unmodified lines | |||
| 90 | ffstream(st)->inject_global_side_data = 1; | 91 | ffstream(st)->inject_global_side_data = 1; |
| 91 | } | 92 | } |
| 92 | } | 93 | } |
| 94 | #endif | ||
| 93 | 95 | ||
| 94 | int avformat_queue_attached_pictures(AVFormatContext *s) | 96 | int avformat_queue_attached_pictures(AVFormatContext *s) |
| 95 | { | 97 | { |