breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
9b8eedd736ea443c4829baaca1ede4e146ebc024
FFmpeg/libavcodec/utils.c
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

119 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink