ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Aug 7
20:52:40 2014 +0200| [4917fecf4a005918d4f32b95683f392f0fae0b51] | committer:
Michael Niedermayer
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4917fecf4a005918d4f32b95683f392f0fae0b51
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
