[FFmpeg-cvslog] Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4

Michael Niedermayer git at videolan.org
Sat Feb 28 19:14:56 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 28 19:04:29 2015 +0100| [a22079b8193b3ce3119b4440a4972098cd141e4e] | committer: Michael Niedermayer

Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4

* commit '06d433366c02ab81a1aaad33d32934b4180d354b':
  h264: Do not share rbsp_buffer across threads

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list