1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer f30a8154ab Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 22:23:01 +02:00
..
2014-08-24 14:35:11 +02:00
2014-07-20 02:01:50 +02:00
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-08-24 14:35:11 +02:00
2014-08-04 13:33:44 +02:00
2014-05-28 03:52:50 +02:00
2012-12-21 00:18:34 +01:00
2013-02-14 23:45:48 +01:00
2014-07-17 11:29:01 +02:00