mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-21 13:56:55 +00:00
3a2d1465c8
* 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> |
||
|---|---|---|
| .. | ||
| libvo | ||
| av_helpers.h | ||
| cpudetect.h | ||
| img_format.c | ||
| img_format.h | ||
| mp_image.c | ||
| mp_image.h | ||
| mp_msg.h | ||
| mpc_info.h | ||
| vf_eq2.c | ||
| vf_eq.c | ||
| vf_fspp.c | ||
| vf_ilpack.c | ||
| vf_pp7.c | ||
| vf_softpulldown.c | ||
| vf_uspp.c | ||
| vf.h | ||
| vfcap.h | ||