virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.

Browse Source 
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2d162e3825)
This commit is contained in:
Diego Elio Pettenò 2011-01-25 00:29:44 +00:00 committed by Michael Niedermayer
parent dff80041e3
commit 4b21c38180
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/iff.c
View File

@ -29,7 +29,6 @@
#include "bytestream.h"
#include "avcodec.h"
#include "get_bits.h"
#include "iff.h"
typedef struct {
AVFrame frame;
@ -120,7 +119,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) {
/**
* Convert CMAP buffer (stored in extradata) to lavc palette format
*/
int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{
int count, i;

30
libavcodec/iff.h
View File

@ -1,30 +0,0 @@
/*
* IFF PBM/ILBM bitmap decoder
* Copyright (c) 2010 Peter Ross <pross@xvid.org>
*
* This file is part of FFmpeg.
*
* FFmpeg 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,
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_IFF_H
#define AVCODEC_IFF_H
#include <stdint.h>
#include "avcodec.h"
int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal);
#endif /* AVCODEC_IFF_H */

1
libavformat/iff.c
View File

@ -30,7 +30,6 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcodec/iff.h"
#include "avformat.h"
#define ID_8SVX MKTAG('8','S','V','X')