Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Nov 2014 23:57:41 +0000 (00:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Nov 2014 23:57:41 +0000 (00:57 +0100)
commit0960cc4cc60fa39a1de19f8f744274becb164bef
tree67e37ab27000ee923b1e12666a93d38b06f27961
parentb546023b9319cbaefb638a2eeac56bdbf53d6f8b
parente3e317e0c015b164b6c2eb8913e393216d78de23
Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'

* commit 'e3e317e0c015b164b6c2eb8913e393216d78de23':
  lavc: Compact the side-data passthrough

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c