Revision 45eaec30

View differences:

libavcodec/h264.c
3386 3386
    return 0;
3387 3387
}
3388 3388

  
3389
static const AVProfile profiles[] = {
3390
    { FF_PROFILE_H264_BASELINE,             "Baseline"              },
3391
    { FF_PROFILE_H264_CONSTRAINED_BASELINE, "Constrained Baseline"  },
3392
    { FF_PROFILE_H264_MAIN,                 "Main"                  },
3393
    { FF_PROFILE_H264_EXTENDED,             "Extended"              },
3394
    { FF_PROFILE_H264_HIGH,                 "High"                  },
3395
    { FF_PROFILE_H264_HIGH_10,              "High 10"               },
3396
    { FF_PROFILE_H264_HIGH_10_INTRA,        "High 10 Intra"         },
3397
    { FF_PROFILE_H264_HIGH_422,             "High 4:2:2"            },
3398
    { FF_PROFILE_H264_HIGH_422_INTRA,       "High 4:2:2 Intra"      },
3399
    { FF_PROFILE_H264_HIGH_444_PREDICTIVE,  "High 4:4:4 Predictive" },
3400
    { FF_PROFILE_H264_HIGH_444_INTRA,       "High 4:4:4 Intra"      },
3401
    { FF_PROFILE_H264_CAVLC_444,            "CAVLC 4:4:4"           },
3402
    { FF_PROFILE_UNKNOWN },
3403
};
3389 3404

  
3390 3405
AVCodec ff_h264_decoder = {
3391 3406
    "h264",
......
3399 3414
    /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
3400 3415
    .flush= flush_dpb,
3401 3416
    .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
3417
    .profiles = NULL_IF_CONFIG_SMALL(profiles),
3402 3418
};
3403 3419

  
3404 3420
#if CONFIG_H264_VDPAU_DECODER
......
3415 3431
    .flush= flush_dpb,
3416 3432
    .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
3417 3433
    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
3434
    .profiles = NULL_IF_CONFIG_SMALL(profiles),
3418 3435
};
3419 3436
#endif

Also available in: Unified diff