[FFmpeg-cvslog] Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 10 00:57:41 2014 +0100| [0960cc4cc60fa39a1de19f8f744274becb164bef] | committer: Michael Niedermayer

Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'

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

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0960cc4cc60fa39a1de19f8f744274becb164bef
---