eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-18 13:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0ebcf878032fa32a02e406a3397b51dc8b45109d
ffmpeg/libavcodec/dsputil.c
Michael Niedermayer 3790801f9c Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b' 
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07 16:17:27 +02:00

36 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink