RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: move decoder existence check to a more appropriate place

Browse Source
This commit is contained in:
Anton Khirnov 2024-01-11 12:19:37 +01:00
parent 217b8757db
commit b2a0a2e6f5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fftools/ffmpeg_dec.c
View File

@ -898,13 +898,6 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx,
const AVCodec *codec = ist->dec; const AVCodec *codec = ist->dec;
int ret; int ret;
if (!codec) {
av_log(ist, AV_LOG_ERROR,
"Decoding requested, but no decoder found for: %s\n",
avcodec_get_name(ist->par->codec_id));
return AVERROR(EINVAL);
}
ret = dec_alloc(&ist->decoder); ret = dec_alloc(&ist->decoder);
if (ret < 0) if (ret < 0)
return ret; return ret;

7
fftools/ffmpeg_demux.c
View File

@ -866,6 +866,13 @@ static int ist_use(InputStream *ist, int decoding_needed)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (decoding_needed && !ist->dec) {
av_log(ist, AV_LOG_ERROR,
"Decoding requested, but no decoder found for: %s\n",
avcodec_get_name(ist->par->codec_id));
return AVERROR(EINVAL);
}
if (ds->sch_idx_stream < 0) { if (ds->sch_idx_stream < 0) {
ret = sch_add_demux_stream(d->sch, d->f.index); ret = sch_add_demux_stream(d->sch, d->f.index);
if (ret < 0) if (ret < 0)