[SCM] libav/experimental: remove cast and use put_sbits, fix assertion in put_bits
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:46:56 UTC 2013
The following commit has been merged in the experimental branch:
commit b8df8d0d1c6b9b5f284319de4965276f6087e7cf
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sun May 31 06:33:58 2009 +0000
remove cast and use put_sbits, fix assertion in put_bits
Originally committed as revision 19024 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 774b0a7..d479298 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -1077,7 +1077,7 @@ static int dv_encode_video_segment(AVCodecContext *avctx, void *arg)
int sz = s->sys->block_sizes[i]>>3;
init_put_bits(&pbs[j], dif, sz);
- put_bits(&pbs[j], 9, (uint16_t)(((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2));
+ put_sbits(&pbs[j], 9, ((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2);
put_bits(&pbs[j], 1, enc_blks[j].dct_mode);
put_bits(&pbs[j], 2, enc_blks[j].cno);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list