[FFmpeg-cvslog] Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 22:36:34 2015 +0200| [2284c38e4c682ac9f179d1c1489849e9b5fcc4b6] | committer: Michael Niedermayer

Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'

* commit 'e0010bb91fc0b067be8aefd2f77e6838537da433':
  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=2284c38e4c682ac9f179d1c1489849e9b5fcc4b6
---