[FFmpeg-cvslog] Merge commit 'c790e31ae46d4304af893d04806ec9e3bff5ae28' into release/2.2

Michael Niedermayer git at videolan.org
Tue Dec 2 14:14:21 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 13:47:55 2014 +0100| [4ed83378bf856621141e555dccf75d2d333901d4] | committer: Michael Niedermayer

Merge commit 'c790e31ae46d4304af893d04806ec9e3bff5ae28' into release/2.2

* commit 'c790e31ae46d4304af893d04806ec9e3bff5ae28':
  lavu: fix memory leaks by using a mutex instead of atomics

Conflicts:
	libavutil/buffer.c

The atomics code is left in place as a fallback for synchronization in the
absence of p/w32 threads. Our ABI did not requires applications to
only use threads (and matching ones) to what libavutil was build with
Our code also was not affected by the leak this change fixes, though
no question the atomics based implementation is not pretty at all.
First and foremost the code must work, being pretty comes after that.

If this causes problems, for example when libavutil is used by multiple
applications each using a different kind of threading system then the
default possibly has to be changed to the uglier atomics.

See: cea3a63ba3d89d8403eef008f7a7c54d645cff70
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list