eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-21 06:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
ffmpeg/libavcodec/x86/dirac_dwt.c
Michael Niedermayer d6676a1605 Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93' 
* commit 'c23ce454b3e33634a188d6facfd2b7182af5af93':
  x86: dsputil: Coalesce all init files

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_x86.h
	libavcodec/x86/motion_est.c

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

6.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink