diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-15 01:38:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-15 01:52:14 +0100 |
| commit | c980be9e3aafad57ec769cbb16c9ad6e640479cb (patch) | |
| tree | a804c9e2517a2e8ec9e5f22890862cbb226a66da /libavcodec/rv40.c | |
| parent | e7dbfa59f218ece7ec65f7ea0ff2950573dd2267 (diff) | |
| parent | dc4e57489fa0f9cf4faf4c85cc405d6db77d84db (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
CDXL demuxer and decoder
hls: Re-add legacy applehttp name to preserve interface compatibility.
hlsproto: Rename the functions and context
hlsproto: Encourage users to try the hls demuxer instead of the proto
doc: Move the hls protocol section into the right place
libavformat: Rename the applehttp protocol to hls
hls: Rename the functions and context
libavformat: Rename the applehttp demuxer to hls
rtpdec: Support H263 in RFC 2190 format
rv30: check block type validity
ttadec: CRC checking
movenc: Support muxing VC1
avconv: Don't split out inline sequence headers when stream copying VC1
rv34: handle size changes during frame multithreading
rv40: prevent undefined signed overflow in rv40_loop_filter()
rv34: use AVERROR return values in ff_rv34_decode_frame()
rv34: use uint16_t for RV34DecContext.deblock_coefs
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
movenc: Use defines instead of hardcoded numbers for RTCP types
smjpegdec: implement seeking
...
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/rv30.c
libavcodec/tta.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
libswscale/x86/swscale_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv40.c')
| -rw-r--r-- | libavcodec/rv40.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 3bd1826b70..a0fa678ada 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -360,7 +360,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) * in addition to the coded ones because because they lie at the edge of * 8x8 block with different enough motion vectors */ - int mvmasks[4]; + unsigned mvmasks[4]; mb_pos = row * s->mb_stride; for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){ @@ -376,7 +376,8 @@ static void rv40_loop_filter(RV34DecContext *r, int row) int c_v_deblock[2], c_h_deblock[2]; int clip_left; int avail[4]; - int y_to_deblock, c_to_deblock[2]; + unsigned y_to_deblock; + int c_to_deblock[2]; q = s->current_picture_ptr->f.qscale_table[mb_pos]; alpha = rv40_alpha_tab[q]; |