eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 23:40:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'

Browse Source 
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-22 22:23:04 +01:00
parent d6d3cfb0aa f9279ee749
commit 672c610d84
14 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/rv30dsp.c
View File

@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "h264chroma.h"
#include "h264qpel.h"
#include "mathops.h"
#include "rv34dsp.h"
#define RV30_LOWPASS(OPNAME, OP) \