← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavcodec/indeo2.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/indeo2.c
171
171
 
172
172
    if (s->decode_delta) { /* intraframe */
173
173
        if ((ret = ir2_decode_plane(s, avctx->width, avctx->height,
174
 
                                    s->picture->data[0], s->picture->linesize[0],
 
174
                                    p->data[0], p->linesize[0],
175
175
                                    ir2_luma_table)) < 0)
176
176
            return ret;
177
177
 
178
178
        /* swapped U and V */
179
179
        if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
180
 
                                    s->picture->data[2], s->picture->linesize[2],
 
180
                                    p->data[2], p->linesize[2],
181
181
                                    ir2_luma_table)) < 0)
182
182
            return ret;
183
183
        if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
184
 
                                    s->picture->data[1], s->picture->linesize[1],
 
184
                                    p->data[1], p->linesize[1],
185
185
                                    ir2_luma_table)) < 0)
186
186
            return ret;
187
187
    } else { /* interframe */
188
188
        if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height,
189
 
                                          s->picture->data[0], s->picture->linesize[0],
 
189
                                          p->data[0], p->linesize[0],
190
190
                                          ir2_luma_table)) < 0)
191
191
            return ret;
192
192
        /* swapped U and V */
193
193
        if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
194
 
                                          s->picture->data[2], s->picture->linesize[2],
 
194
                                          p->data[2], p->linesize[2],
195
195
                                          ir2_luma_table)) < 0)
196
196
            return ret;
197
197
        if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
198
 
                                          s->picture->data[1], s->picture->linesize[1],
 
198
                                          p->data[1], p->linesize[1],
199
199
                                          ir2_luma_table)) < 0)
200
200
            return ret;
201
201
    }
202
202
 
203
 
    if ((ret = av_frame_ref(picture, s->picture)) < 0)
 
203
    if ((ret = av_frame_ref(picture, p)) < 0)
204
204
        return ret;
205
205
 
206
206
    *got_frame = 1;