virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00
Code Issues Releases Activity
Files
648f7a6ec5b34b03074db89ddbf6b2bc39f95ab0
FFmpeg/libavcodec/pixels.h
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

1.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink