← Back to branch summary

~siretart/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/tiertexseqv.c

  • Committer: Reinhard Tartler
  • Date: 2013-10-23 03:04:17 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: siretart@tauware.de-20131023030417-1o6mpkl1l0raifjt
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/tiertexseqv.c
214
214
    SeqVideoContext *seq = avctx->priv_data;
215
215
 
216
216
    seq->avctx = avctx;
217
 
    avctx->pix_fmt = PIX_FMT_PAL8;
 
217
    avctx->pix_fmt = AV_PIX_FMT_PAL8;
218
218
 
219
219
    seq->frame.data[0] = NULL;
220
220
 
222
222
}
223
223
 
224
224
static int seqvideo_decode_frame(AVCodecContext *avctx,
225
 
                                 void *data, int *data_size,
 
225
                                 void *data, int *got_frame,
226
226
                                 AVPacket *avpkt)
227
227
{
228
228
    const uint8_t *buf = avpkt->data;
240
240
    if (seqvideo_decode(seq, buf, buf_size))
241
241
        return AVERROR_INVALIDDATA;
242
242
 
243
 
    *data_size = sizeof(AVFrame);
 
243
    *got_frame       = 1;
244
244
    *(AVFrame *)data = seq->frame;
245
245
 
246
246
    return buf_size;
259
259
AVCodec ff_tiertexseqvideo_decoder = {
260
260
    .name           = "tiertexseqvideo",
261
261
    .type           = AVMEDIA_TYPE_VIDEO,
262
 
    .id             = CODEC_ID_TIERTEXSEQVIDEO,
 
262
    .id             = AV_CODEC_ID_TIERTEXSEQVIDEO,
263
263
    .priv_data_size = sizeof(SeqVideoContext),
264
264
    .init           = seqvideo_decode_init,
265
265
    .close          = seqvideo_decode_end,
266
266
    .decode         = seqvideo_decode_frame,
267
267
    .capabilities   = CODEC_CAP_DR1,
268
 
    .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
 
268
    .long_name      = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
269
269
};