[FFmpeg-devel] [PATCH] avformat/async: Use the correct return values

Michael Niedermayer michael at niedermayer.cc
Sat Jan 16 01:30:04 EET 2021


On Thu, Jan 14, 2021 at 11:29:18PM +0800, lance.lmwang at gmail.com wrote:
> From: Limin Wang <lance.lmwang at gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
>  libavformat/async.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/libavformat/async.c b/libavformat/async.c
> index a0bdfa2..801b20e 100644
> --- a/libavformat/async.c
> +++ b/libavformat/async.c
> @@ -263,24 +263,28 @@ static int async_open(URLContext *h, const char *arg, int flags, AVDictionary **
>      ret = pthread_mutex_init(&c->mutex, NULL);
>      if (ret != 0) {
>          av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", av_err2str(ret));
> +        ret = AVERROR(ret);
>          goto mutex_fail;
>      }
>  
>      ret = pthread_cond_init(&c->cond_wakeup_main, NULL);
>      if (ret != 0) {
>          av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", av_err2str(ret));
> +        ret = AVERROR(ret);
>          goto cond_wakeup_main_fail;
>      }
>  
>      ret = pthread_cond_init(&c->cond_wakeup_background, NULL);
>      if (ret != 0) {
>          av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", av_err2str(ret));
> +        ret = AVERROR(ret);
>          goto cond_wakeup_background_fail;
>      }
>  
>      ret = pthread_create(&c->async_buffer_thread, NULL, async_buffer_task, h);
>      if (ret) {
>          av_log(h, AV_LOG_ERROR, "pthread_create failed : %s\n", av_err2str(ret));
> +        ret = AVERROR(ret);

the av_err2str() calls should probably be after AVERROR

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20210116/6db1f841/attachment.sig>


More information about the ffmpeg-devel mailing list