[FFmpeg-cvslog] Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

Michael Niedermayer git at videolan.org
Thu May 1 16:47:21 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 16:41:41 2014 +0200| [cac07d0e103656a2436ea04b700128ce436a4d06] | committer: Michael Niedermayer

Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list