Merge commit '386e80610de282c92ad5897683ccaf2675766ac5' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:07:24 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:07:42 +0000 (21:07 +0200)
* 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@gmx.at>

Trivial merge