generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'

Browse Source 
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
  dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Conflicts:
	libavcodec/bit_depth_template.c
	libavcodec/motionpixels_tablegen.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-14 00:38:47 +01:00
parent 16f619f57c 05563ccacc
commit 6016b8329b
20 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/imgconvert.c
View File

@@ -486,7 +486,7 @@ static void deinterlace_line_c(uint8_t *dst,
const uint8_t *lum,
int size)
{
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int sum;
for(;size > 0;size--) {
@@ -509,7 +509,7 @@ static void deinterlace_line_inplace_c(uint8_t *lum_m4, uint8_t *lum_m3,
uint8_t *lum_m2, uint8_t *lum_m1,
uint8_t *lum, int size)
{
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int sum;
for(;size > 0;size--) {