Michael Niedermayer
|
684a9152c3
|
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
Rename tpel_template.c ---> pel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-06-13 19:03:55 +02:00 |
|
Diego Biurrun
|
f0ce9913d0
|
Rename tpel_template.c ---> pel_template.c
The new name more accurately describes what the file is about.
|
2014-06-13 05:21:34 -07:00 |
|
Michael Niedermayer
|
772d46d3b3
|
avcodec/qpeldsp: Restore author attribution
See: 368f50359e
See:
similarity index 51%
copy from libavcodec/dsputil.c
copy to libavcodec/qpeldsp.c
index 6d41dfc..0beeab8 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/qpeldsp.c
@@ -1,9 +1,5 @@
/*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by 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:40 +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 |
|