Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

[ffmpeg] / libavcodec / yuv4enc.c

diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c
index 2a5af8fdaefc9b8c00076dcdff47cfc10a0c1f2f..8185d06185414462dda76f2cc6615920e0bf3160 100644 (file)
--- a/libavcodec/yuv4enc.c
+++ b/libavcodec/yuv4enc.c
@@ -42,9 +42,8 @@ static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     uint8_t *y, *u, *v;
     int i, j, ret;
 
-    if ((ret = ff_alloc_packet2(avctx, pkt, 6 * (avctx->width + 1 >> 1) * (avctx->height + 1 >> 1))) < 0) {
+    if ((ret = ff_alloc_packet2(avctx, pkt, 6 * (avctx->width + 1 >> 1) * (avctx->height + 1 >> 1))) < 0)
         return ret;
-    }
     dst = pkt->data;
 
     avctx->coded_frame->reference = 0;
@@ -84,7 +83,7 @@ static av_cold int yuv4_encode_close(AVCodecContext *avctx)
 AVCodec ff_yuv4_encoder = {
     .name         = "yuv4",
     .type         = AVMEDIA_TYPE_VIDEO,
-    .id           = CODEC_ID_YUV4,
+    .id           = AV_CODEC_ID_YUV4,
     .init         = yuv4_encode_init,
     .encode2      = yuv4_encode_frame,
     .close        = yuv4_encode_close,