/**
* @file libavcodec/eatgv.c
* Electronic Arts TGV Video Decoder
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
*
* Technical details here:
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
#include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
#include "libavutil/lzo.h"
#define EA_PREAMBLE_SIZE 8
*/
static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) {
unsigned char *dst_end = dst + width*height;
- int size,size1,size2,offset,run;
+ int size, size1, size2, av_uninit(offset), run;
unsigned char *dst_start = dst;
if (src[0] & 0x01)
s->block_codebook[i][15-j] = tmp[get_bits(&gb, 2)];
}
+ if (get_bits_left(&gb) < vector_bits *
+ (s->avctx->height/4) * (s->avctx->width/4))
+ return -1;
+
/* read vectors and build frame */
for(y=0; y<s->avctx->height/4; y++)
for(x=0; x<s->avctx->width/4; x++) {
static int tgv_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
TgvContext *s = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
int chunk_type;
NULL,
tgv_decode_end,
tgv_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV Video"),
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"),
};