diff options
| author | James Almer <jamrial@gmail.com> | 2021-05-01 23:43:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-05-07 09:27:22 -0300 |
| commit | f140239777270161bfdf3964bfb057b43ad66a1a (patch) | |
| tree | bbfa0a75f8b7c685854656a8a2f9dabd198b39f3 /libavformat | |
| parent | 7489f632815c98ad58c3db71d1a5239b5dae266c (diff) | |
avformat: move AVStream.stream_identifier to AVStreamInternal
It's a private field, no reason to have it exposed in a public header.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/internal.h | 7 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 647d1642fc..a28ac372da 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1004,13 +1004,6 @@ typedef struct AVStream { int64_t cur_dts; /** - * Stream Identifier - * This is the MPEG-TS stream identifier +1 - * 0 means unknown - */ - int stream_identifier; - - /** * An opaque field for libavformat internal usage. * Must not be accessed in any way by callers. */ diff --git a/libavformat/internal.h b/libavformat/internal.h index 291c25b226..d57e63c1c2 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -382,6 +382,13 @@ struct AVStreamInternal { * Number of frames that have been demuxed during avformat_find_stream_info() */ int codec_info_nb_frames; + + /** + * Stream Identifier + * This is the MPEG-TS stream identifier +1 + * 0 means unknown + */ + int stream_identifier; }; void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type); diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index fb454b9fd3..a02965bacf 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1995,7 +1995,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type } break; case 0x52: /* stream identifier descriptor */ - st->stream_identifier = 1 + get8(pp, desc_end); + st->internal->stream_identifier = 1 + get8(pp, desc_end); break; case METADATA_DESCRIPTOR: if (get16(pp, desc_end) == 0xFFFF) @@ -2114,7 +2114,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type // Listing of data_component_ids is in STD-B10, part 2, Annex J. // Component tag limits are documented in TR-B14, fascicle 2, // Vol. 3, Section 2, 4.2.8.1 - int actual_component_tag = st->stream_identifier - 1; + int actual_component_tag = st->internal->stream_identifier - 1; int picked_profile = FF_PROFILE_UNKNOWN; int data_component_id = get16(pp, desc_end); if (data_component_id < 0) |