← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/mjpegbdec.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/mjpegbdec.c
38
38
}
39
39
 
40
40
static int mjpegb_decode_frame(AVCodecContext *avctx,
41
 
                              void *data, int *data_size,
 
41
                              void *data, int *got_frame,
42
42
                              AVPacket *avpkt)
43
43
{
44
44
    const uint8_t *buf = avpkt->data;
137
137
    //XXX FIXME factorize, this looks very similar to the EOI code
138
138
 
139
139
    *picture= *s->picture_ptr;
140
 
    *data_size = sizeof(AVFrame);
 
140
    *got_frame = 1;
141
141
 
142
142
    if(!s->lossless){
143
143
        picture->quality= FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]);