← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/sp5xdec.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/sp5xdec.c
31
31
 
32
32
 
33
33
static int sp5x_decode_frame(AVCodecContext *avctx,
34
 
                              void *data, int *data_size,
 
34
                              void *data, int *got_frame,
35
35
                              AVPacket *avpkt)
36
36
{
37
37
    const uint8_t *buf = avpkt->data;
86
86
    av_init_packet(&avpkt_recoded);
87
87
    avpkt_recoded.data = recoded;
88
88
    avpkt_recoded.size = j;
89
 
    i = ff_mjpeg_decode_frame(avctx, data, data_size, &avpkt_recoded);
 
89
    i = ff_mjpeg_decode_frame(avctx, data, got_frame, &avpkt_recoded);
90
90
 
91
91
    av_free(recoded);
92
92