mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
fftools/ffmpeg: move InputStream.codec_desc to private data
It is not used outside of ffmpeg_demux.
This commit is contained in:
parent
9afe3f5274
commit
882bc8049d
@ -358,7 +358,6 @@ typedef struct InputStream {
|
||||
Decoder *decoder;
|
||||
AVCodecContext *dec_ctx;
|
||||
const AVCodec *dec;
|
||||
const AVCodecDescriptor *codec_desc;
|
||||
|
||||
AVRational framerate_guessed;
|
||||
|
||||
|
@ -83,6 +83,8 @@ typedef struct DemuxStream {
|
||||
///< dts of the last packet read for this stream (in AV_TIME_BASE units)
|
||||
int64_t dts;
|
||||
|
||||
const AVCodecDescriptor *codec_desc;
|
||||
|
||||
/* number of packets successfully read for this stream */
|
||||
uint64_t nb_packets;
|
||||
// combined size of all the packets read
|
||||
@ -320,8 +322,8 @@ static int ist_dts_update(DemuxStream *ds, AVPacket *pkt, FrameData *fd)
|
||||
(AVRational){ 2, 1 });
|
||||
int fields = 2;
|
||||
|
||||
if (ist->codec_desc &&
|
||||
(ist->codec_desc->props & AV_CODEC_PROP_FIELDS) &&
|
||||
if (ds->codec_desc &&
|
||||
(ds->codec_desc->props & AV_CODEC_PROP_FIELDS) &&
|
||||
av_stream_get_parser(ist->st))
|
||||
fields = 1 + av_stream_get_parser(ist->st)->repeat_pict;
|
||||
|
||||
@ -1249,7 +1251,7 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st)
|
||||
return ret;
|
||||
}
|
||||
|
||||
ist->codec_desc = avcodec_descriptor_get(ist->par->codec_id);
|
||||
ds->codec_desc = avcodec_descriptor_get(ist->par->codec_id);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user