diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-22 09:02:06 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-22 09:02:06 +0000 |
| commit | 21effaa4b20bbd34ecc11e5bef1211dcca6fc2bc (patch) | |
| tree | 1133d9773a2f902e9bfbcb694fc6364bb31409d9 /libavcodec/mpegvideo.c | |
| parent | d8f28a77270b2d94fea92d56c8737eb626adce8d (diff) | |
| download | ffmpeg-21effaa4b20bbd34ecc11e5bef1211dcca6fc2bc.tar.gz | |
Change the type of pblocks from pointers to short array into
pointers to array of 64 DCTELEM, similarly to other block fields.
This also get rid of some casts and fixes a warning.
Originally committed as revision 17517 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2eec211abc..06d842b2d9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -301,7 +301,7 @@ static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ s->block= s->blocks[0]; for(i=0;i<12;i++){ - s->pblocks[i] = (short *)(&s->block[i]); + s->pblocks[i] = &s->block[i]; } return 0; fail: @@ -357,7 +357,7 @@ void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){ memcpy(dst, src, sizeof(MpegEncContext)); backup_duplicate_context(dst, &bak); for(i=0;i<12;i++){ - dst->pblocks[i] = (short *)(&dst->block[i]); + dst->pblocks[i] = &dst->block[i]; } //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads } |