Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 20:36:34 +0000 (22:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 20:37:18 +0000 (22:37 +0200)
commit2284c38e4c682ac9f179d1c1489849e9b5fcc4b6
tree19161b4c6a472b9d332e79a3a517b50af7eadd7b
parent0318013afcffe0c3b8a0f0bf9f5f527098f6fa47
parente0010bb91fc0b067be8aefd2f77e6838537da433
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@gmx.at>