summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 17:44:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 17:44:56 +0100
commitac8987591f5503768e7587c25693928f26fcb3d1 (patch)
tree2531b37d6673aea7f4d1c61549978664a2c807ac /tools
parenta793a587df05bfc789e040c13329825cf9a261a3 (diff)
parent88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f (diff)
downloadffmpeg-streaming-ac8987591f5503768e7587c25693928f26fcb3d1.zip
ffmpeg-streaming-ac8987591f5503768e7587c25693928f26fcb3d1.tar.gz
Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/patcheck2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/patcheck b/tools/patcheck
index a1d4c06..83db4c0 100755
--- a/tools/patcheck
+++ b/tools/patcheck
@@ -173,7 +173,7 @@ vertical align =
/* and * align
arrays fitting in smaller types
variables written to twice with no interspaced read
-memset(block, 0, 6*64*sizeof(DCTELEM)); -> clear_blocks
+memset(block, 0, 6*64*sizeof(int16_t)); -> clear_blocks
check existence of long_name in AVCodec
check that the patch does not touch codec & (de)muxer layer at the same time ->split
OpenPOWER on IntegriCloud