apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-02 23:24:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'

Browse Source 
* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
  dsputil: Remove hpel functions (moved to hpeldsp)

Conflicts:
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-20 15:36:23 +02:00
parent 6ec26157b9 54cd5e4f92
commit d2d2c309e8
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/vc1dsp.h
View File

@@ -29,6 +29,7 @@
#define AVCODEC_VC1DSP_H
#include "dsputil.h"
#include "hpeldsp.h"
#include "h264chroma.h"
typedef void (*vc1op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, ptrdiff_t line_size, int h);