X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fr210dec.c;h=ae215fe9680f260b1d76d88a424ca681c58bfb90;hb=b239526873dc81f9b66796ad4d9fe1cb93ec34d3;hp=b88211eeb74d215e9b63bd08707b87f632fb96fa;hpb=4383692896499933ab7a4978314067be0edbfdb3;p=ffmpeg diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index b88211eeb74..ae215fe9680 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -3,20 +3,20 @@ * * Copyright (c) 2009 Reimar Doeffinger * - * 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 */ @@ -64,9 +64,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint32_t pixel = av_be2ne32(*src++); uint16_t r, g, b; if (avctx->codec_id==CODEC_ID_R210) { - b = pixel << 6; - g = (pixel >> 4) & 0xffc0; - r = (pixel >> 14) & 0xffc0; + b = pixel << 6; + g = (pixel >> 4) & 0xffc0; + r = (pixel >> 14) & 0xffc0; } else { b = pixel << 4; g = (pixel >> 6) & 0xffc0; @@ -97,7 +97,7 @@ static av_cold int decode_close(AVCodecContext *avctx) } #if CONFIG_R210_DECODER -AVCodec r210_decoder = { +AVCodec ff_r210_decoder = { "r210", AVMEDIA_TYPE_VIDEO, CODEC_ID_R210, @@ -111,7 +111,7 @@ AVCodec r210_decoder = { }; #endif #if CONFIG_R10K_DECODER -AVCodec r10k_decoder = { +AVCodec ff_r10k_decoder = { "r10k", AVMEDIA_TYPE_VIDEO, CODEC_ID_R10K,