diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 03:23:37 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 03:23:37 +0400 |
| commit | 8e2bab5d4bddb4029503c0f90623854948ddb3c5 (patch) | |
| tree | 33a095ce0e92ed353c96c9b25b746ee45a2a00c7 /libavcodec/vc1dec.c | |
| parent | 7023fb81c78e10a6a7af6e6bc8902f99da81c458 (diff) | |
| parent | 78212cefe14a2086dc1ea3778b76623b949e5d0c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
drawtext: remove typo
pcm-mpeg: implement new audio decoding api
w32thread: port fixes to pthread_cond_broadcast() from x264.
doc: add editor configuration section with Vim and Emacs settings
dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
avformat/utils: Drop unused goto label.
doxygen: Replace '\' by '@' in Doxygen markup tags.
cosmetics: drop some completely pointless parentheses
cljr: simplify CLJRContext
drawtext: introduce rand(min, max)
drawtext: introduce explicit draw/hide variable
rtmp: Use nb_invokes for all invoke commands
Conflicts:
libavcodec/mpegvideo.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6f1af89e22..20b7f72291 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -236,7 +236,7 @@ static void vc1_put_signed_blocks_clamped(VC1Context *v) if (s->mb_x) { topleft_mb_pos = (s->mb_y - 1) * s->mb_stride + s->mb_x - 1; fieldtx = v->fieldtx_plane[topleft_mb_pos]; - stride_y = (s->linesize) << fieldtx; + stride_y = s->linesize << fieldtx; v_dist = (16 - fieldtx) >> (fieldtx == 0); s->dsp.put_signed_pixels_clamped(v->block[v->topleft_blk_idx][0], s->dest[0] - 16 * s->linesize - 16, |