Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer 7a60348053 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>
2013-12-09 21:33:51 +01:00
Vittorio Giovara 7e244c6860 avframe: add codec-independent stereoscopic metadata 2013-12-09 16:02:43 +01:00