← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic

« back to all changes in this revision

Viewing changes to libavcodec/mss1.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-12-21 15:32:13 UTC
  • mto: (1.2.18)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20121221153213-fudzrugjzivtv0wp
Tags: upstream-9~beta3
Import upstream version 9~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/mss1.c
135
135
    return !!ncol;
136
136
}
137
137
 
138
 
static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
138
static int mss1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
139
139
                             AVPacket *avpkt)
140
140
{
141
141
    const uint8_t *buf = avpkt->data;
180
180
    memcpy(ctx->pic.data[1], c->pal, AVPALETTE_SIZE);
181
181
    ctx->pic.palette_has_changed = pal_changed;
182
182
 
183
 
    *data_size = sizeof(AVFrame);
 
183
    *got_frame      = 1;
184
184
    *(AVFrame*)data = ctx->pic;
185
185
 
186
186
    /* always report that the buffer was completely consumed */