diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-03-22 17:45:34 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-03-28 08:40:01 +0100 |
| commit | 0edbd00ccf82a2cfc0c4d4a01fa7c62c8e027968 (patch) | |
| tree | 1177f8a1eff9ba8cd78cc766ff45d5a4baf90f28 /fftools/ffmpeg_demux.c | |
| parent | 372c78dd42f2b1ca743473b9c32fad71c65919e0 (diff) | |
| download | ffmpeg-0edbd00ccf82a2cfc0c4d4a01fa7c62c8e027968.tar.gz | |
fftools/ffmpeg_{demux,dec}: pass -bitexact through DecoderFlags
Avoids abusing AV_DICT_MULTIKEY and relying on undocumented AVDictionary
ordering behaviour.
Diffstat (limited to 'fftools/ffmpeg_demux.c')
| -rw-r--r-- | fftools/ffmpeg_demux.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 73b0eb0da1..af4b4cfd1e 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -908,11 +908,11 @@ static int ist_use(InputStream *ist, int decoding_needed) if (decoding_needed && ds->sch_idx_dec < 0) { int is_audio = ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; - ds->dec_opts.flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | - (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE) | - (!!(d->loop && is_audio) * DECODER_FLAG_SEND_END_TS) + ds->dec_opts.flags |= (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | + (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE) | + (!!(d->loop && is_audio) * DECODER_FLAG_SEND_END_TS) #if FFMPEG_OPT_TOP - | ((ist->top_field_first >= 0) * DECODER_FLAG_TOP_FIELD_FIRST) + | ((ist->top_field_first >= 0) * DECODER_FLAG_TOP_FIELD_FIRST) #endif ; @@ -1357,8 +1357,7 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ist->user_set_discard = ist->st->discard; } - if (o->bitexact) - av_dict_set(&ds->decoder_opts, "flags", "+bitexact", AV_DICT_MULTIKEY); + ds->dec_opts.flags |= DECODER_FLAG_BITEXACT * !!o->bitexact; /* Attached pics are sparse, therefore we would not want to delay their decoding * till EOF. */ |