Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

* commit '9301486408a480629336af4d7fd873c0f28fb2d5': avcodec: add stream-level stereo3d side data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit f30a8152 parents 56cc754 93014865 files · +71 −2Browse files

Showing the changes to doc/APIchanges (1 of 5 files). Show all

Unified · Split

doc/APIchanges+3−0

@@ -15,6 +15,9 @@ libavutil: 2014-08-09 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2014-08-xx - xxxxxxx - lavc 56.1.0 - avcodec.h
		19	Add AV_PKT_DATA_STEREO3D to export container-level stereo3d information.
		20
18	2014-08-25 - 215db29 / b263f8f - lavf 56.3.100 / 56.3.0 - avformat.h	21	2014-08-25 - 215db29 / b263f8f - lavf 56.3.100 / 56.3.0 - avformat.h
19	Add AVFormatContext.max_ts_probe.	22	Add AVFormatContext.max_ts_probe.
20		23

Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code