[FFmpeg-cvslog] Merge commit '386e80610de282c92ad5897683ccaf2675766ac5' into release/2.4

Michael Niedermayer git at videolan.org
Tue May 19 21:17:14 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 21:07:24 2015 +0200| [8624b49276558d451cf3c494d30975f31e926afb] | committer: Michael Niedermayer

Merge commit '386e80610de282c92ad5897683ccaf2675766ac5' into release/2.4

* commit '386e80610de282c92ad5897683ccaf2675766ac5':
  mux: Do not leave stale side data pointers in ff_interleave_add_packet()

Conflicts:
	libavformat/mux.c

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

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





More information about the ffmpeg-cvslog mailing list