5 Commits

Author	SHA1	Message	Date
Michael Niedermayer	2904d052b7	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@gmx.at>	2014-07-25 13:05:08 +02:00
Diego Biurrun	7fb993d338	qpeldsp: Mark source pointer in qpel_mc_func function pointer const	2014-07-25 02:52:54 -07:00
Michael Niedermayer	8c891d90ca	avcodec/x86/qpeldsp_init: Restore author attribution ... See: 368f50359e See: 44eb495128, and many others See: similarity index 83% copy from libavcodec/x86/dsputil_init.c copy to libavcodec/x86/qpeldsp_init.c index ebbf97f..8f296a1 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/qpeldsp_init.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 2000, 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> + * quarterpel DSP functions * * This file is part of FFmpeg. * Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-05-30 04:05:29 +02:00
Michael Niedermayer	98a6806fdd	Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a' ... * commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-05-30 02:43:34 +02:00
Diego Biurrun	368f50359e	dsputil: Split off quarterpel bits into their own context	2014-05-29 06:48:31 -07:00