← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/vmnc.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/vmnc.c
285
285
    return src - ssrc;
286
286
}
287
287
 
288
 
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
 
288
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 
289
                        AVPacket *avpkt)
289
290
{
290
291
    const uint8_t *buf = avpkt->data;
291
292
    int buf_size = avpkt->size;
446
447
            put_cursor(outptr, c->pic.linesize[0], c, c->cur_x, c->cur_y);
447
448
        }
448
449
    }
449
 
    *data_size = sizeof(AVFrame);
 
450
    *got_frame      = 1;
450
451
    *(AVFrame*)data = c->pic;
451
452
 
452
453
    /* always report that the buffer was completely consumed */