Merge commit '7e244c68600f479270e979258e389ed5240885fb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 20:33:51 +0000 (21:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 20:33:51 +0000 (21:33 +0100)
commit7a6034805305cb5d6a3d755d774f0ad09119049e
tree7062d51b46c39f95dec61723b03f40158285c11b
parent64f73acd1d3853e55a7cd7631987dfd83c4171e7
parent7e244c68600f479270e979258e389ed5240885fb
Merge commit '7e244c68600f479270e979258e389ed5240885fb'

* commit '7e244c68600f479270e979258e389ed5240885fb':
  avframe: add codec-independent stereoscopic metadata

Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/APIchanges
libavutil/Makefile
libavutil/frame.h
libavutil/stereo3d.c
libavutil/stereo3d.h
libavutil/version.h