generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
110420aac0
ffmpeg/libavfilter/libmpcodecs
History
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
..
libvo libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41) 2014-05-03 02:37:27 +02:00
av_helpers.h
cpudetect.h
img_format.c libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41) 2014-05-03 02:37:27 +02:00
img_format.h libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41) 2014-05-03 02:37:27 +02:00
mp_image.c libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41) 2014-05-03 02:37:27 +02:00
mp_image.h
mp_msg.h
mpc_info.h
vf_eq2.c
vf_eq.c
vf_fspp.c Merge commit '2d60444331fca1910510038dd3817bea885c2367' 2014-07-17 23:27:40 +02:00
vf_ilpack.c libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41) 2014-05-03 02:37:27 +02:00
vf_pp7.c libmpcodecs: Fix compilation due to missing static in suncc. 2014-05-09 18:33:55 +02:00
vf_softpulldown.c
vf_uspp.c libmpcodecs/vf_uspp: check avcodec_open() return code 2014-05-11 02:13:28 +02:00
vf.h fix various typos 2014-06-03 10:58:19 -08:00
vfcap.h