← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/mmvideo.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/mmvideo.c
172
172
}
173
173
 
174
174
static int mm_decode_frame(AVCodecContext *avctx,
175
 
                            void *data, int *data_size,
 
175
                            void *data, int *got_frame,
176
176
                            AVPacket *avpkt)
177
177
{
178
178
    const uint8_t *buf = avpkt->data;
209
209
 
210
210
    memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
211
211
 
212
 
    *data_size = sizeof(AVFrame);
 
212
    *got_frame      = 1;
213
213
    *(AVFrame*)data = s->frame;
214
214
 
215
215
    return buf_size;