aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-10-15 17:19:07 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-10-15 17:19:07 +0000
commit91405541d5c9e5c0d5c16b1d0ce025c3e8943c7d (patch)
tree90d24db88e74eb13d847e4f7bfd5845aac5c8953
parent77edf866483072f90c2312fcde2d7ba06e4e6745 (diff)
downloadffmpeg-91405541d5c9e5c0d5c16b1d0ce025c3e8943c7d.tar.gz
Remove silly casts to the same type as we already have.
Originally committed as revision 20242 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/asv1.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 3b60bc1566..7a385e47a1 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -394,7 +394,7 @@ static int decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size;
ASV1Context * const a = avctx->priv_data;
AVFrame *picture = data;
- AVFrame * const p= (AVFrame*)&a->picture;
+ AVFrame * const p= &a->picture;
int mb_x, mb_y;
if(p->data[0])
@@ -474,7 +474,7 @@ for(i=0; i<s->avctx->extradata_size; i++){
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
ASV1Context * const a = avctx->priv_data;
AVFrame *pict = data;
- AVFrame * const p= (AVFrame*)&a->picture;
+ AVFrame * const p= &a->picture;
int size;
int mb_x, mb_y;
@@ -536,13 +536,13 @@ static av_cold void common_init(AVCodecContext *avctx){
a->mb_width2 = (avctx->width + 0) / 16;
a->mb_height2 = (avctx->height + 0) / 16;
- avctx->coded_frame= (AVFrame*)&a->picture;
+ avctx->coded_frame= &a->picture;
a->avctx= avctx;
}
static av_cold int decode_init(AVCodecContext *avctx){
ASV1Context * const a = avctx->priv_data;
- AVFrame *p= (AVFrame*)&a->picture;
+ AVFrame *p= &a->picture;
int i;
const int scale= avctx->codec_id == CODEC_ID_ASV1 ? 1 : 2;
@@ -551,7 +551,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, scantab);
avctx->pix_fmt= PIX_FMT_YUV420P;
- a->inv_qscale= ((uint8_t*)avctx->extradata)[0];
+ a->inv_qscale= avctx->extradata[0];
if(a->inv_qscale == 0){
av_log(avctx, AV_LOG_ERROR, "illegal qscale 0\n");
if(avctx->codec_id == CODEC_ID_ASV1)