[FFmpeg-cvslog] Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
Michael Niedermayer
git at videolan.org
Mon Jan 21 16:21:47 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 16:14:41 2013 +0100| [5f61e09a8f28af45d7db1f5e7767d14322255f49] | committer: Michael Niedermayer
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
* commit '93af2734ee609133eaeca28329d7f13241dd411f':
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f61e09a8f28af45d7db1f5e7767d14322255f49
---
More information about the ffmpeg-cvslog
mailing list