← Back to branch summary

~ubuntu-branches/debian/squeeze/gstreamer0.10-ffmpeg/squeeze

« back to all changes in this revision

Viewing changes to gst-libs/ext/ffmpeg/libavcodec/dxa.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-02-19 18:14:59 UTC
  • mfrom: (4.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20100219181459-mect96st3px2jfsi
Tags: 0.10.9.2-1
* New upstream pre-release:
  + debian/patches/03_restricted-caps.patch,
    debian/patches/04_ignore-vdpau.patch:
    - Dropped, merged upstream.
* debian/patches/03_too-new-codec-ids.patch:
  + Disable some ffmpeg codec IDs because Debian's
    ffmpeg is once again too old...

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/ffmpeg/libavcodec/dxa.c
188
188
    return 0;
189
189
}
190
190
 
191
 
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
 
191
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
192
192
{
 
193
    const uint8_t *buf = avpkt->data;
 
194
    int buf_size = avpkt->size;
193
195
    DxaDecContext * const c = avctx->priv_data;
194
196
    uint8_t *outptr, *srcptr, *tmpptr;
195
197
    unsigned long dsize;
293
295
    c->avctx = avctx;
294
296
    avctx->pix_fmt = PIX_FMT_PAL8;
295
297
 
296
 
    if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
297
 
        return -1;
298
 
    }
299
 
 
300
298
    c->dsize = avctx->width * avctx->height * 2;
301
299
    if((c->decomp_buf = av_malloc(c->dsize)) == NULL) {
302
300
        av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
328
326
    NULL,
329
327
    decode_end,
330
328
    decode_frame,
 
329
    CODEC_CAP_DR1,
331
330
    .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
332
331
};
333
332