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>
pull/362/head
James Almer 4 years ago
parent 7489f63281
commit f140239777
  1. 7
      libavformat/avformat.h
  2. 7
      libavformat/internal.h
  3. 4
      libavformat/mpegts.c

@ -1003,13 +1003,6 @@ typedef struct AVStream {
int64_t first_dts; int64_t first_dts;
int64_t cur_dts; 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. * An opaque field for libavformat internal usage.
* Must not be accessed in any way by callers. * Must not be accessed in any way by callers.

@ -382,6 +382,13 @@ struct AVStreamInternal {
* Number of frames that have been demuxed during avformat_find_stream_info() * Number of frames that have been demuxed during avformat_find_stream_info()
*/ */
int codec_info_nb_frames; 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); void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type);

@ -1995,7 +1995,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
} }
break; break;
case 0x52: /* stream identifier descriptor */ case 0x52: /* stream identifier descriptor */
st->stream_identifier = 1 + get8(pp, desc_end); st->internal->stream_identifier = 1 + get8(pp, desc_end);
break; break;
case METADATA_DESCRIPTOR: case METADATA_DESCRIPTOR:
if (get16(pp, desc_end) == 0xFFFF) 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. // Listing of data_component_ids is in STD-B10, part 2, Annex J.
// Component tag limits are documented in TR-B14, fascicle 2, // Component tag limits are documented in TR-B14, fascicle 2,
// Vol. 3, Section 2, 4.2.8.1 // 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 picked_profile = FF_PROFILE_UNKNOWN;
int data_component_id = get16(pp, desc_end); int data_component_id = get16(pp, desc_end);
if (data_component_id < 0) if (data_component_id < 0)

Loading…
Cancel
Save