[FFmpeg-cvslog] Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'

Michael Niedermayer git at videolan.org
Thu May 29 00:26:39 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 00:20:48 2014 +0200| [d858ee717bed6307b8e772bd5039ab001aeae03f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d858ee717bed6307b8e772bd5039ab001aeae03f
---





More information about the ffmpeg-cvslog mailing list