Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
[ffmpeg.git] / libavcodec / r210enc.c
index 0a7dd33..9e209fd 100644 (file)
@@ -39,7 +39,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 {
     int i, j, ret;
     int aligned_width = FFALIGN(avctx->width,
-                                avctx->codec_id == CODEC_ID_R10K ? 1 : 64);
+                                avctx->codec_id == AV_CODEC_ID_R10K ? 1 : 64);
     int pad = (aligned_width - avctx->width) * 4;
     uint8_t *src_line;
     uint8_t *dst;
@@ -60,11 +60,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
             uint16_t r = *src++ >> 6;
             uint16_t g = *src++ >> 6;
             uint16_t b = *src++ >> 4;
-            if (avctx->codec_id == CODEC_ID_R210)
+            if (avctx->codec_id == AV_CODEC_ID_R210)
                 pixel = (r << 20) | (g << 10) | b >> 2;
             else
                 pixel = (r << 22) | (g << 12) | b;
-            if (avctx->codec_id == CODEC_ID_AVRP)
+            if (avctx->codec_id == AV_CODEC_ID_AVRP)
                 bytestream_put_le32(&dst, pixel);
             else
                 bytestream_put_be32(&dst, pixel);
@@ -90,7 +90,7 @@ static av_cold int encode_close(AVCodecContext *avctx)
 AVCodec ff_r210_encoder = {
     .name           = "r210",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_R210,
+    .id             = AV_CODEC_ID_R210,
     .init           = encode_init,
     .encode2        = encode_frame,
     .close          = encode_close,
@@ -102,7 +102,7 @@ AVCodec ff_r210_encoder = {
 AVCodec ff_r10k_encoder = {
     .name           = "r10k",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_R10K,
+    .id             = AV_CODEC_ID_R10K,
     .init           = encode_init,
     .encode2        = encode_frame,
     .close          = encode_close,
@@ -114,7 +114,7 @@ AVCodec ff_r10k_encoder = {
 AVCodec ff_avrp_encoder = {
     .name           = "avrp",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_AVRP,
+    .id             = AV_CODEC_ID_AVRP,
     .init           = encode_init,
     .encode2        = encode_frame,
     .close          = encode_close,