virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-04-29 12:54:10 +02:00
Code Issues Releases Activity
75,730 Commits 39 Branches 417 Tags
513fcd4167d409e90f8d2b27df875b869762a7e2
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer 77bc342975 Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81' 
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
	libavcodec/arm/hpeldsp_init_arm.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 22:53:33 +01:00
Diego Biurrun 322a1dda97 dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros 2014-03-22 06:17:29 -07:00