virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

fftools/ffmpeg_dec: stop using Decoder.pkt

Browse Source 
It is only used for flushing the subtitle decoder, so allocate a
dedicated packet for that.

Keep Decoder.pkt unused for now, it will be repurposed in future
commits.
This commit is contained in:
Anton Khirnov 2023-06-02 15:12:58 +02:00
parent 1bdd53e2f9
commit 7d4e00ccf0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fftools/ffmpeg_dec.c
View File

@ -385,10 +385,20 @@ out:
static int transcode_subtitles(InputStream *ist, const AVPacket *pkt)
{
AVPacket *flush_pkt = NULL;
AVSubtitle subtitle;
int got_output;
int ret = avcodec_decode_subtitle2(ist->dec_ctx,
&subtitle, &got_output, pkt);
int ret;
if (!pkt) {
flush_pkt = av_packet_alloc();
if (!flush_pkt)
return AVERROR(ENOMEM);
}
ret = avcodec_decode_subtitle2(ist->dec_ctx, &subtitle, &got_output,
pkt ? pkt : flush_pkt);
av_packet_free(&flush_pkt);
if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Error decoding subtitles: %s\n",
@ -399,7 +409,7 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt)
}
if (ret < 0 || !got_output) {
if (!pkt->size)
if (!pkt)
sub2video_flush(ist);
return ret < 0 ? ret : AVERROR_EOF;
}
@ -432,7 +442,7 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
int ret;
if (dec->codec_type == AVMEDIA_TYPE_SUBTITLE)
return transcode_subtitles(ist, pkt ? pkt : d->pkt);
return transcode_subtitles(ist, pkt);
// With fate-indeo3-2, we're getting 0-sized packets before EOF for some
// reason. This seems like a semi-critical bug. Don't trigger EOF, and