diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-07 08:15:31 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-08 07:42:09 +0100 |
| commit | 542b83fc90c188f868607861f2bb196a7c700835 (patch) | |
| tree | 0949f202efca5e45dcf6fe6aaff9635f279dcadb | |
| parent | d8b31be6caebd8d1321ecb754b6e7daaf81dc111 (diff) | |
| download | ffmpeg-542b83fc90c188f868607861f2bb196a7c700835.tar.gz | |
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/svq1enc.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f2f37c865e..cad2520da4 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2923,7 +2923,7 @@ static int h264_set_parameter_from_sps(H264Context *h) return 0; } -static enum PixelFormat get_pixel_format(H264Context *h) +static enum AVPixelFormat get_pixel_format(H264Context *h) { switch (h->sps.bit_depth_luma) { case 9: diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 22668958a9..f06609e442 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -627,7 +627,7 @@ AVCodec ff_svq1_encoder = { .init = svq1_encode_init, .encode2 = svq1_encode_frame, .close = svq1_encode_end, - .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_YUV410P, - AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, + AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index db79cbff22..a994d6f2f5 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -512,23 +512,23 @@ static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[], dst[1] + srcSliceY * dstStride[1] }; switch (c->srcFormat) { - case PIX_FMT_RGB24: + case AV_PIX_FMT_RGB24: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, stride201, srcSliceH, alpha_first, 3, c->srcW); break; - case PIX_FMT_BGR24: + case AV_PIX_FMT_BGR24: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, stride102, srcSliceH, alpha_first, 3, c->srcW); break; - case PIX_FMT_ARGB: + case AV_PIX_FMT_ARGB: alpha_first = 1; - case PIX_FMT_RGBA: + case AV_PIX_FMT_RGBA: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, stride201, srcSliceH, alpha_first, 4, c->srcW); break; - case PIX_FMT_ABGR: + case AV_PIX_FMT_ABGR: alpha_first = 1; - case PIX_FMT_BGRA: + case AV_PIX_FMT_BGRA: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, stride102, srcSliceH, alpha_first, 4, c->srcW); break; |