aboutsummaryrefslogtreecommitdiffstats
path: root/fftools/ffmpeg_demux.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-05-18 05:39:39 +0200
committerAnton Khirnov <anton@khirnov.net>2023-05-28 10:47:59 +0200
commitdadeb28e257ef7d15695a5da57e1a7a81e716876 (patch)
treed011b4fe39c3c7052c5128ae7d377e74a754c345 /fftools/ffmpeg_demux.c
parent335688a3d3835c3b6e1364231b75e6817d7941a0 (diff)
downloadffmpeg-dadeb28e257ef7d15695a5da57e1a7a81e716876.tar.gz
fftools/ffmpeg_dec: add decoder private data
Move InputStream.decoded_frame to it. Analogous to what has been previously done for all the other major components.
Diffstat (limited to 'fftools/ffmpeg_demux.c')
-rw-r--r--fftools/ffmpeg_demux.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 33322ac565..29691cf68b 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -815,7 +815,8 @@ static void ist_free(InputStream **pist)
if (!ist)
return;
- av_frame_free(&ist->decoded_frame);
+ dec_free(&ist->decoder);
+
av_packet_free(&ist->pkt);
av_dict_free(&ist->decoder_opts);
avsubtitle_free(&ist->prev_sub.subtitle);
@@ -1196,10 +1197,6 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d)
exit_program(1);
}
- ist->decoded_frame = av_frame_alloc();
- if (!ist->decoded_frame)
- report_and_exit(AVERROR(ENOMEM));
-
ist->pkt = av_packet_alloc();
if (!ist->pkt)
report_and_exit(AVERROR(ENOMEM));