3 Commits

Author	SHA1	Message	Date
Michael Niedermayer	162cffca80	avcodec/me_cmp: restore author attribution and copyrights ... These where removed by libav in See: git show -C 2d60444331 diff --git a/libavcodec/dsputil.c b/libavcodec/me_cmp.c similarity index 98% rename from libavcodec/dsputil.c rename to libavcodec/me_cmp.c index ba71a99..9fcc937 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/me_cmp.c @@ -1,8 +1,4 @@ /* - * DSP utils - * Copyright (c) 2000, 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> - * * This file is part of Libav. * * Libav is free software; you can redistribute it and/or Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-07-17 23:59:28 +02:00
Michael Niedermayer	3a2d1465c8	Merge commit '2d60444331fca1910510038dd3817bea885c2367' ... * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-07-17 23:27:40 +02:00
Diego Biurrun	2d60444331	dsputil: Split motion estimation compare bits off into their own context	2014-07-17 09:07:10 -07:00