generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Browse Source
This commit is contained in:
Anton Khirnov 2013-03-07 08:15:31 +01:00
parent d8b31be6ca
commit 542b83fc90
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -2923,7 +2923,7 @@ static int h264_set_parameter_from_sps(H264Context *h)
return 0; return 0;
} }
static enum PixelFormat get_pixel_format(H264Context *h) static enum AVPixelFormat get_pixel_format(H264Context *h)
{ {
switch (h->sps.bit_depth_luma) { switch (h->sps.bit_depth_luma) {
case 9: case 9:

4
libavcodec/svq1enc.c
View File

@ -627,7 +627,7 @@ AVCodec ff_svq1_encoder = {
.init = svq1_encode_init, .init = svq1_encode_init,
.encode2 = svq1_encode_frame, .encode2 = svq1_encode_frame,
.close = svq1_encode_end, .close = svq1_encode_end,
.pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_YUV410P, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
}; };

12
libswscale/swscale_unscaled.c
View File

@ -512,23 +512,23 @@ static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[],
dst[1] + srcSliceY * dstStride[1] }; dst[1] + srcSliceY * dstStride[1] };
switch (c->srcFormat) { switch (c->srcFormat) {
case PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201,
stride201, srcSliceH, alpha_first, 3, c->srcW); stride201, srcSliceH, alpha_first, 3, c->srcW);
break; break;
case PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102,
stride102, srcSliceH, alpha_first, 3, c->srcW); stride102, srcSliceH, alpha_first, 3, c->srcW);
break; break;
case PIX_FMT_ARGB: case AV_PIX_FMT_ARGB:
alpha_first = 1; alpha_first = 1;
case PIX_FMT_RGBA: case AV_PIX_FMT_RGBA:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201,
stride201, srcSliceH, alpha_first, 4, c->srcW); stride201, srcSliceH, alpha_first, 4, c->srcW);
break; break;
case PIX_FMT_ABGR: case AV_PIX_FMT_ABGR:
alpha_first = 1; alpha_first = 1;
case PIX_FMT_BGRA: case AV_PIX_FMT_BGRA:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102,
stride102, srcSliceH, alpha_first, 4, c->srcW); stride102, srcSliceH, alpha_first, 4, c->srcW);
break; break;