← 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/imc.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/imc.c
36
36
 
37
37
#define ALT_BITSTREAM_READER
38
38
#include "avcodec.h"
39
 
#include "bitstream.h"
 
39
#include "get_bits.h"
40
40
#include "dsputil.h"
41
41
 
42
42
#include "imcdata.h"
84
84
 
85
85
    DSPContext dsp;
86
86
    FFTContext fft;
87
 
    DECLARE_ALIGNED_16(FFTComplex, samples[COEFFS/2]);
88
 
    DECLARE_ALIGNED_16(float, out_samples[COEFFS]);
 
87
    DECLARE_ALIGNED_16(FFTComplex, samples)[COEFFS/2];
 
88
    DECLARE_ALIGNED_16(float, out_samples)[COEFFS];
89
89
} IMCContext;
90
90
 
91
91
static VLC huffman_vlc[4][4];
639
639
 
640
640
static int imc_decode_frame(AVCodecContext * avctx,
641
641
                            void *data, int *data_size,
642
 
                            const uint8_t * buf, int buf_size)
 
642
                            AVPacket *avpkt)
643
643
{
 
644
    const uint8_t *buf = avpkt->data;
 
645
    int buf_size = avpkt->size;
644
646
 
645
647
    IMCContext *q = avctx->priv_data;
646
648