[FFmpeg-cvslog] Merge commit 'd82d5379caca21005d8906829b35361c4a65408e'

Clément Bœsch git at videolan.org
Sat Apr 8 15:57:19 EEST 2017


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  8 14:52:30 2017 +0200| [b853d6aa5b918c6ca4786f14cd1fa8a1c4254fe9] | committer: Clément Bœsch

Merge commit 'd82d5379caca21005d8906829b35361c4a65408e'

* commit 'd82d5379caca21005d8906829b35361c4a65408e':
  mmaldec: initialize refcount using atomic_init()

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b853d6aa5b918c6ca4786f14cd1fa8a1c4254fe9
---

 libavcodec/mmaldec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 81fcebc..0b1195d 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -283,7 +283,7 @@ static int ffmal_update_format(AVCodecContext *avctx)
         ret = AVERROR(ENOMEM);
         goto fail;
     }
-    atomic_store(&ctx->pool_out->refcount, 1);
+    atomic_init(&ctx->pool_out->refcount, 1);
 
     if (!format_out)
         goto fail;


======================================================================




More information about the ffmpeg-cvslog mailing list