rtmp: Factorize the code by adding handle_invoke_status

[ffmpeg] / libavcodec / huffyuv.c

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 943e48c5693b14867a4aa6b84454162b9b853fd1..8e428ac4f9d2007e7b960b3f5b161b17585359bd 100644 (file)
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -612,7 +612,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
         }
     }else s->context= 0;
 
-    if(avctx->codec->id==CODEC_ID_HUFFYUV){
+    if(avctx->codec->id==AV_CODEC_ID_HUFFYUV){
         if(avctx->pix_fmt==PIX_FMT_YUV420P){
             av_log(avctx, AV_LOG_ERROR, "Error: YV12 is not supported by huffyuv; use vcodec=ffvhuff or format=422p\n");
             return -1;
@@ -1451,7 +1451,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 AVCodec ff_huffyuv_decoder = {
     .name             = "huffyuv",
     .type             = AVMEDIA_TYPE_VIDEO,
-    .id               = CODEC_ID_HUFFYUV,
+    .id               = AV_CODEC_ID_HUFFYUV,
     .priv_data_size   = sizeof(HYuvContext),
     .init             = decode_init,
     .close            = decode_end,
@@ -1467,7 +1467,7 @@ AVCodec ff_huffyuv_decoder = {
 AVCodec ff_ffvhuff_decoder = {
     .name             = "ffvhuff",
     .type             = AVMEDIA_TYPE_VIDEO,
-    .id               = CODEC_ID_FFVHUFF,
+    .id               = AV_CODEC_ID_FFVHUFF,
     .priv_data_size   = sizeof(HYuvContext),
     .init             = decode_init,
     .close            = decode_end,
@@ -1483,7 +1483,7 @@ AVCodec ff_ffvhuff_decoder = {
 AVCodec ff_huffyuv_encoder = {
     .name           = "huffyuv",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_HUFFYUV,
+    .id             = AV_CODEC_ID_HUFFYUV,
     .priv_data_size = sizeof(HYuvContext),
     .init           = encode_init,
     .encode2        = encode_frame,
@@ -1499,7 +1499,7 @@ AVCodec ff_huffyuv_encoder = {
 AVCodec ff_ffvhuff_encoder = {
     .name           = "ffvhuff",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_FFVHUFF,
+    .id             = AV_CODEC_ID_FFVHUFF,
     .priv_data_size = sizeof(HYuvContext),
     .init           = encode_init,
     .encode2        = encode_frame,