ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a048bd44b2563dc453e0c97bdca60cf028feaf50
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
