~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/qpeg.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler, Jonathan Nieder, Reinhard Tartler
  • Date: 2011-05-13 12:31:33 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (1.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20110513123133-zqcsj91sf5489y4s
Tags: 4:0.7~beta2-1
[ Jonathan Nieder ]
* only install doc/APIChanges in *-dev and libav-doc packages
* move note on source package lineage to README.Debian
* install NEWS.Debian in libavcodec-dev
* use dpkg source format 3.0 (quilt)
* allow "debian/rules clean" as unprivileged user

[ Reinhard Tartler ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
259
259
    int delta;
260
260
    const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
261
261
 
262
 
    if(p->data[0])
263
 
        avctx->release_buffer(avctx, p);
264
 
 
265
 
    p->reference= 0;
266
 
    if(avctx->get_buffer(avctx, p) < 0){
267
 
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 
262
    p->reference = 3;
 
263
    if (avctx->reget_buffer(avctx, p) < 0) {
 
264
        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
268
265
        return -1;
269
266
    }
270
267
    outdata = a->pic.data[0];