eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 15:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e9e608ad5804d483de23e43b98d7af4d1b51e2e4
ffmpeg/libavcodec/x86/mpegaudiodec.c
Michael Niedermayer 6b2e65078c Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9' 
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
  dsputil: Move LOCAL_ALIGNED macros to libavutil

Conflicts:
	libavcodec/dvdec.c
	libavcodec/imc.c
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:33:57 +01:00

10 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink