[FFmpeg-cvslog] Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
Michael Niedermayer
git at videolan.org
Sat Apr 20 16:20:20 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 16:07:20 2013 +0200| [9ae56b85b664f5067d0e165039303dd61e39f856] | committer: Michael Niedermayer
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
dsputil: Remove non-8bpp draw_edge
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ae56b85b664f5067d0e165039303dd61e39f856
---
More information about the ffmpeg-cvslog
mailing list