ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Mon Jun
1 12:48:52 2015 +0200| [ed393622b27dfd68ee4736cde4cfe7b71c12d50e] | committer:
Michael Niedermayer
Merge commit '296d70f58517d6702bfda32178c1e395bca9665e' into release/2.2
* commit '296d70f58517d6702bfda32178c1e395bca9665e':
mux: Do not leave stale side data pointers in ff_interleave_add_packet()
Conflicts:
libavformat/mux.c
See: bfb3ed1a9d5dafdc185080fdd88d02ff7221d30a
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed393622b27dfd68ee4736cde4cfe7b71c12d50e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
