~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavutil/pixdesc.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:
29
29
#include "internal.h"
30
30
#include "intreadwrite.h"
31
31
#include "avstring.h"
 
32
#include "version.h"
32
33
 
33
34
void av_read_image_line(uint16_t *dst,
34
35
                        const uint8_t *data[4], const int linesize[4],
313
314
        },
314
315
        .flags = AV_PIX_FMT_FLAG_PLANAR,
315
316
    },
 
317
#if FF_API_XVMC
316
318
    [AV_PIX_FMT_XVMC_MPEG2_MC] = {
317
319
        .name = "xvmcmc",
318
320
        .flags = AV_PIX_FMT_FLAG_HWACCEL,
321
323
        .name = "xvmcidct",
322
324
        .flags = AV_PIX_FMT_FLAG_HWACCEL,
323
325
    },
 
326
#endif /* FF_API_XVMC */
 
327
#if !FF_API_XVMC
 
328
    [AV_PIX_FMT_XVMC] = {
 
329
        .name = "xvmc",
 
330
        .flags = AV_PIX_FMT_FLAG_HWACCEL,
 
331
    },
 
332
#endif /* !FF_API_XVMC */
324
333
    [AV_PIX_FMT_UYVY422] = {
325
334
        .name = "uyvy422",
326
335
        .nb_components = 3,