[FFmpeg-cvslog] Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
Michael Niedermayer
git at videolan.org
Fri Jul 25 13:05:50 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 25 12:58:03 2014 +0200| [2904d052b7ca8714fda5c039c958bc0a0ae40877] | committer: Michael Niedermayer
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
qpeldsp: Mark source pointer in qpel_mc_func function pointer const
Conflicts:
libavcodec/h264qpel_template.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/rv40dsp_init.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2904d052b7ca8714fda5c039c958bc0a0ae40877
---
More information about the ffmpeg-cvslog
mailing list