[FFmpeg-cvslog] Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'
Michael Niedermayer
git at videolan.org
Mon Apr 8 12:45:09 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 8 12:40:26 2013 +0200| [5f49e92eb934d56fc1f031b579281ce48c251c4f] | committer: Michael Niedermayer
Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'
* commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9':
x86: qpel: Move fullpel and l2 functions to a separate file
bfin: Make vp3 functions static
Conflicts:
libavcodec/bfin/vp3_bfin.c
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f49e92eb934d56fc1f031b579281ce48c251c4f
---
More information about the ffmpeg-cvslog
mailing list