1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00

Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'

* commit '6d212599aa684f30511fb08ca30fe2378405304e':
  avformat: Provide a standard compliance flag

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-29 00:20:48 +02:00
4 changed files with 16 additions and 1 deletions

View File

@@ -15,6 +15,10 @@ libavutil: 2012-10-22
API changes, most recent first:
2014-05-24 - xxxxxxx - lavf 55.19.0 - avformat.h
Add strict_std_compliance and related AVOptions to support experimental
muxing.
2014-05-26 - xxxxxxx - lavu 52.87.100 - threadmessage.h
Add thread message queue API.