Mercurial > libavcodec.hg
comparison mpeg12.c @ 5431:192360fa9b06 libavcodec
get rid of a useless variable
author | michael |
---|---|
date | Tue, 31 Jul 2007 21:00:17 +0000 |
parents | d248295bd595 |
children | e0624692025f |
comparison
equal
deleted
inserted
replaced
5430:d248295bd595 | 5431:192360fa9b06 |
---|---|
1661 static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, | 1661 static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, |
1662 const uint8_t **buf, int buf_size) | 1662 const uint8_t **buf, int buf_size) |
1663 { | 1663 { |
1664 MpegEncContext *s = &s1->mpeg_enc_ctx; | 1664 MpegEncContext *s = &s1->mpeg_enc_ctx; |
1665 AVCodecContext *avctx= s->avctx; | 1665 AVCodecContext *avctx= s->avctx; |
1666 int ret; | |
1667 const int field_pic= s->picture_structure != PICT_FRAME; | 1666 const int field_pic= s->picture_structure != PICT_FRAME; |
1668 const int lowres= s->avctx->lowres; | 1667 const int lowres= s->avctx->lowres; |
1669 | 1668 |
1670 s->resync_mb_x= | 1669 s->resync_mb_x= |
1671 s->resync_mb_y= -1; | 1670 s->resync_mb_y= -1; |
1736 //one 1 we memcpy blocks in xvmcvideo | 1735 //one 1 we memcpy blocks in xvmcvideo |
1737 if(s->avctx->xvmc_acceleration > 1) | 1736 if(s->avctx->xvmc_acceleration > 1) |
1738 XVMC_init_block(s);//set s->block | 1737 XVMC_init_block(s);//set s->block |
1739 #endif | 1738 #endif |
1740 | 1739 |
1741 ret = mpeg_decode_mb(s, s->block); | 1740 if(mpeg_decode_mb(s, s->block) < 0) |
1742 | |
1743 dprintf(s->avctx, "ret=%d\n", ret); | |
1744 if (ret < 0) | |
1745 return -1; | 1741 return -1; |
1746 | 1742 |
1747 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs | 1743 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs |
1748 const int wrap = field_pic ? 2*s->b8_stride : s->b8_stride; | 1744 const int wrap = field_pic ? 2*s->b8_stride : s->b8_stride; |
1749 int xy = s->mb_x*2 + s->mb_y*2*wrap; | 1745 int xy = s->mb_x*2 + s->mb_y*2*wrap; |