diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 22:23:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 22:23:01 +0200 |
| commit | f30a8154abf2905b61b08974bc71f04e8d7afc68 (patch) | |
| tree | 2c487d535bd7955a2c1e598a4409142790d8230e /ffmpeg.c | |
| parent | 56cc754c76d3aba81e121502d0d420242b7023b1 (diff) | |
| parent | 9301486408a480629336af4d7fd873c0f28fb2d5 (diff) | |
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>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions