[FFmpeg-cvslog] Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'

Michael Niedermayer git at videolan.org
Fri Mar 13 22:48:06 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 13 22:20:17 2015 +0100| [a048bd44b2563dc453e0c97bdca60cf028feaf50] | committer: Michael Niedermayer

Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'

* commit '117b432748ca87de4cd0f09d9b1495545e264733':
  lavc: Introduce AVCodec internal capabilities

Conflicts:
	libavcodec/utils.c

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

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





More information about the ffmpeg-cvslog mailing list