#include "avcodec.h"
#include "bytestream.h"
+#include "internal.h"
typedef struct QpegContext{
AVCodecContext *avctx;
filled = 0;
dst -= stride;
height--;
+ if (height < 0)
+ break;
}
}
} else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */
filled = 0;
dst -= stride;
height--;
+ if (height < 0)
+ break;
}
}
} else if(code >= 0x80) { /* skip code: 0x80..0xBF */
}
static int decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
uint8_t ctable[128];
QpegContext * const a = avctx->priv_data;
AVFrame * const p = &a->pic;
uint8_t* outdata;
- int delta;
+ int delta, ret;
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
if (avpkt->size < 0x86) {
}
bytestream2_init(&a->buffer, avpkt->data, avpkt->size);
- p->reference = 3;
- if (avctx->reget_buffer(avctx, p) < 0) {
+ if ((ret = ff_reget_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
}
outdata = a->pic.data[0];
bytestream2_skip(&a->buffer, 4);
}
memcpy(a->pic.data[1], a->pal, AVPALETTE_SIZE);
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = a->pic;
+ if ((ret = av_frame_ref(data, &a->pic)) < 0)
+ return ret;
+
+ *got_frame = 1;
return avpkt->size;
}
QpegContext * const a = avctx->priv_data;
a->avctx = avctx;
- avctx->pix_fmt= PIX_FMT_PAL8;
+ avctx->pix_fmt= AV_PIX_FMT_PAL8;
a->refdata = av_malloc(avctx->width * avctx->height);
+ avcodec_get_frame_defaults(&a->pic);
+
return 0;
}
QpegContext * const a = avctx->priv_data;
AVFrame * const p = &a->pic;
- if(p->data[0])
- avctx->release_buffer(avctx, p);
+ av_frame_unref(p);
av_free(a->refdata);
return 0;