har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf: move AVStream.probe_data to AVStreamInternal

Browse Source 
Those are private fields, no reason to have them exposed in a public
header.
This commit is contained in:
Anton Khirnov 2020-10-09 09:22:36 +02:00
parent 91a98cc4ea
commit 30f5180ca6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@ -1083,10 +1083,10 @@ typedef struct AVStream {
* last packet in packet_buffer for this stream when muxing. * last packet in packet_buffer for this stream when muxing.
*/ */
struct AVPacketList *last_in_packet_buffer; struct AVPacketList *last_in_packet_buffer;
AVProbeData probe_data;
#if LIBAVFORMAT_VERSION_MAJOR < 59 #if LIBAVFORMAT_VERSION_MAJOR < 59
// kept for ABI compatibility only, do not access in any way // kept for ABI compatibility only, do not access in any way
AVProbeData unused6;
int64_t unused5[16+1]; int64_t unused5[16+1];
void *unused2; void *unused2;
int unused3; int unused3;

2
libavformat/internal.h
View File

@ -336,6 +336,8 @@ struct AVStreamInternal {
* - decoding: Set by libavformat to calculate sample_aspect_ratio internally * - decoding: Set by libavformat to calculate sample_aspect_ratio internally
*/ */
AVRational display_aspect_ratio; AVRational display_aspect_ratio;
AVProbeData probe_data;
}; };
#ifdef __GNUC__ #ifdef __GNUC__

5
libavformat/utils.c
View File

@ -676,7 +676,7 @@ static void force_codec_ids(AVFormatContext *s, AVStream *st)
static int probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) static int probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt)
{ {
if (st->internal->request_probe>0) { if (st->internal->request_probe>0) {
AVProbeData *pd = &st->probe_data; AVProbeData *pd = &st->internal->probe_data;
int end; int end;
av_log(s, AV_LOG_DEBUG, "probing stream %d pp:%d\n", st->index, st->probe_packets); av_log(s, AV_LOG_DEBUG, "probing stream %d pp:%d\n", st->index, st->probe_packets);
--st->probe_packets; --st->probe_packets;
@ -4343,6 +4343,8 @@ static void free_stream(AVStream **pst)
av_bsf_free(&st->internal->bsfc); av_bsf_free(&st->internal->bsfc);
av_freep(&st->internal->priv_pts); av_freep(&st->internal->priv_pts);
av_freep(&st->internal->index_entries); av_freep(&st->internal->index_entries);
av_freep(&st->internal->probe_data.buf);
av_bsf_free(&st->internal->extract_extradata.bsf); av_bsf_free(&st->internal->extract_extradata.bsf);
av_packet_free(&st->internal->extract_extradata.pkt); av_packet_free(&st->internal->extract_extradata.pkt);
@ -4354,7 +4356,6 @@ static void free_stream(AVStream **pst)
av_dict_free(&st->metadata); av_dict_free(&st->metadata);
avcodec_parameters_free(&st->codecpar); avcodec_parameters_free(&st->codecpar);
av_freep(&st->probe_data.buf);
#if FF_API_LAVF_AVCTX #if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
avcodec_free_context(&st->codec); avcodec_free_context(&st->codec);