← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/msvideo1.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/msvideo1.c
286
286
}
287
287
 
288
288
static int msvideo1_decode_frame(AVCodecContext *avctx,
289
 
                                void *data, int *data_size,
 
289
                                void *data, int *got_frame,
290
290
                                AVPacket *avpkt)
291
291
{
292
292
    const uint8_t *buf = avpkt->data;
317
317
    else
318
318
        msvideo1_decode_16bit(s);
319
319
 
320
 
    *data_size = sizeof(AVFrame);
 
320
    *got_frame      = 1;
321
321
    *(AVFrame*)data = s->frame;
322
322
 
323
323
    /* report that the buffer was completely consumed */