X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fc93.c;h=ecfd035d75b06194e1c92b82380d549330d02f69;hb=62acb4937e06a3802735106a9d9fa48db87d0d36;hp=ed6e91d831272f73ab1aeaf30874e5b212de4bba;hpb=d36beb3f6902b1217beda576aa18abf7eb72b03c;p=ffmpeg diff --git a/libavcodec/c93.c b/libavcodec/c93.c index ed6e91d8312..ecfd035d75b 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -2,20 +2,20 @@ * Interplay C93 video decoder * Copyright (c) 2007 Anssi Hannula * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -137,10 +137,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, stride = newpic->linesize[0]; if (buf[0] & C93_FIRST_FRAME) { - newpic->pict_type = FF_I_TYPE; + newpic->pict_type = AV_PICTURE_TYPE_I; newpic->key_frame = 1; } else { - newpic->pict_type = FF_P_TYPE; + newpic->pict_type = AV_PICTURE_TYPE_P; newpic->key_frame = 0; } @@ -243,14 +243,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, } AVCodec ff_c93_decoder = { - "c93", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_C93, - sizeof(C93DecoderContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, + .name = "c93", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_C93, + .priv_data_size = sizeof(C93DecoderContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), };