diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-14 01:53:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-14 01:53:31 +0100 |
| commit | 04b53746ad296b9167002ec5d16a9cfb9de7985b (patch) | |
| tree | 091021a7ecae7fe76b9d180c2fa1a2d4a4c66ef4 /libavcodec/eatgv.c | |
| parent | 387783749faca39c98571d139c32866923ab5653 (diff) | |
| parent | 7dfe8f55575a3ae0fdd6f0678fa9627122580b07 (diff) | |
| download | ffmpeg-04b53746ad296b9167002ec5d16a9cfb9de7985b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Use 4 byte startcodes for H.264
matroskadec: Mark variable as av_unused.
Move some conditionally used variables into the block where they are used.
Drop some completely unnecessary av_unused attributes.
swscale: Remove unused variable alpMmxFilter.
Drop unnecessary av_uninit attributes from some variable declarations.
movenc: Support muxing wmapro in ismv/isma
mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
swscale: use yuv2packed1() functions for unscaled chroma also.
swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
swscale: fix invalid memory accesses in yuvpacked1() functions.
Move PS2 MMI code below the mips subdirectory, where it belongs.
mips: Move MMI function declarations to a header.
build: Set correct dependencies for rtmp* protocols implemented by librtmp.
Conflicts:
libavcodec/ac3enc_template.c
libavformat/mpegtsenc.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eatgv.c')
| -rw-r--r-- | libavcodec/eatgv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 37f84bf5ef..25f1b7b847 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -66,7 +66,7 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx){ */ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) { unsigned char *dst_end = dst + width*height; - int size, size1, size2, av_uninit(offset), run; + int size, size1, size2, offset, run; unsigned char *dst_start = dst; if (src[0] & 0x01) |