diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-27 01:47:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-27 02:53:21 +0200 |
| commit | 027264cb82134c83413810810b24340f6290e11a (patch) | |
| tree | 11009209889b89443c2194dda88ef1ed7c4976ec /libavcodec/bink.c | |
| parent | 701012d676042608cd6ec3317c1936a246f436d7 (diff) | |
| parent | ca7d8256e32e4dbafadc54a65b441945ac759ca9 (diff) | |
| download | ffmpeg-027264cb82134c83413810810b24340f6290e11a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
ARM: add ARMv6 optimised av_clip_uintp2
ARM: remove volatile from asm statements in libavutil/intmath
ARM: fix av_clipl_int32_arm()
v4l: include avdevice.h
ffserver: move close_connection() call to avoid a temporary string and copy.
lavf: initialize demuxer private options.
AVOptions: set string default values.
lavdevice: mark v4l for removal on next major bump.
swscale: fix compile on ppc.
swscale: fix compile on x86-32.
build: Remove generated .version file on distclean.
configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
ffplay: Remove disabled code.
Mark parameterless function declarations as 'void'.
swscale: use av_clip_uint8() in yuv2yuv1_c().
swscale: remove VOF/VOFW.
swscale: split chroma buffers into separate U/V planes.
swscale: replace formatConvBuffer[VOF] by allocated array.
rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bink.c')
| -rw-r--r-- | libavcodec/bink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index d1985eddb2..ef07747dbc 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1208,7 +1208,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac /** * Caclulate quantization tables for version b */ -static av_cold void binkb_calc_quant() +static av_cold void binkb_calc_quant(void) { uint8_t inv_bink_scan[64]; double s[64]; |