diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-10-13 10:31:51 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-10-16 16:29:12 +0200 |
| commit | cb80ec0b6cd7f954839427b4c86958d1475f2df4 (patch) | |
| tree | 87f883d47797685932769337434ff825649e8e2b /libavformat/demux_utils.c | |
| parent | 6d05e7e314207209200566f5b6fb0a77bc968028 (diff) | |
| download | ffmpeg-cb80ec0b6cd7f954839427b4c86958d1475f2df4.tar.gz | |
lavf: move demuxing-specific fields from FFFormatContext to FormatContextInternal
Diffstat (limited to 'libavformat/demux_utils.c')
| -rw-r--r-- | libavformat/demux_utils.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index 86f551245b..fd0424524b 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -25,6 +25,7 @@ #include "libavcodec/bytestream.h" #include "libavcodec/packet_internal.h" #include "avformat.h" +#include "avformat_internal.h" #include "avio_internal.h" #include "demux.h" #include "internal.h" @@ -42,7 +43,7 @@ void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type) AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, int64_t start, int64_t end, const char *title) { - FFFormatContext *const si = ffformatcontext(s); + FormatContextInternal *const fci = ff_fc_internal(s); AVChapter *chapter = NULL; int ret; @@ -52,13 +53,13 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba } if (!s->nb_chapters) { - si->chapter_ids_monotonic = 1; - } else if (!si->chapter_ids_monotonic || s->chapters[s->nb_chapters-1]->id >= id) { + fci->chapter_ids_monotonic = 1; + } else if (!fci->chapter_ids_monotonic || s->chapters[s->nb_chapters-1]->id >= id) { for (unsigned i = 0; i < s->nb_chapters; i++) if (s->chapters[i]->id == id) chapter = s->chapters[i]; if (!chapter) - si->chapter_ids_monotonic = 0; + fci->chapter_ids_monotonic = 0; } if (!chapter) { @@ -92,7 +93,7 @@ void av_format_inject_global_side_data(AVFormatContext *s) int avformat_queue_attached_pictures(AVFormatContext *s) { - FFFormatContext *const si = ffformatcontext(s); + FormatContextInternal *const fci = ff_fc_internal(s); int ret; for (unsigned i = 0; i < s->nb_streams; i++) if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC && @@ -104,7 +105,7 @@ int avformat_queue_attached_pictures(AVFormatContext *s) continue; } - ret = avpriv_packet_list_put(&si->raw_packet_buffer, + ret = avpriv_packet_list_put(&fci->raw_packet_buffer, &s->streams[i]->attached_pic, av_packet_ref, 0); if (ret < 0) |