[FFmpeg-cvslog] Merge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'
Michael Niedermayer
git at videolan.org
Fri Apr 12 22:27:11 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 22:21:27 2013 +0200| [52bda1d903954c353bdd718a034675ee78977561] | committer: Michael Niedermayer
Merge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'
* commit 'a89c05500f68d94a0269e68bc522abfd420c5497':
x86: h264qpel: int --> ptrdiff_t for some line_size parameters
Conflicts:
libavcodec/x86/qpelbase.asm
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52bda1d903954c353bdd718a034675ee78977561
---
More information about the ffmpeg-cvslog
mailing list