| Message ID | 20210607121705.822-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 94af6414ab74b9785bee89bd0a167c4788d6b598 |
| Headers | show |
| Series | [FFmpeg-devel] ffmpeg: silence a thread_safe_callbacks deprecation warning | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On 6/7/2021 9:17 AM, James Almer wrote: > Signed-off-by: James Almer <jamrial@gmail.com> > --- > fftools/ffmpeg.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index 04ddc9e60b..e97d879cb3 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -2962,7 +2962,9 @@ static int init_input_stream(int ist_index, char *error, int error_len) > ist->dec_ctx->get_format = get_format; > ist->dec_ctx->get_buffer2 = get_buffer; > #if LIBAVCODEC_VERSION_MAJOR < 60 > +FF_DISABLE_DEPRECATION_WARNINGS > ist->dec_ctx->thread_safe_callbacks = 1; > +FF_ENABLE_DEPRECATION_WARNINGS > #endif > > if (ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE && Will apply.
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 04ddc9e60b..e97d879cb3 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2962,7 +2962,9 @@ static int init_input_stream(int ist_index, char *error, int error_len) ist->dec_ctx->get_format = get_format; ist->dec_ctx->get_buffer2 = get_buffer; #if LIBAVCODEC_VERSION_MAJOR < 60 +FF_DISABLE_DEPRECATION_WARNINGS ist->dec_ctx->thread_safe_callbacks = 1; +FF_ENABLE_DEPRECATION_WARNINGS #endif if (ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE &&
Signed-off-by: James Almer <jamrial@gmail.com> --- fftools/ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+)