summaryrefslogtreecommitdiff
path: root/libavformat/gifdec.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-11-02 23:22:23 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-11-02 23:22:23 +0000
commitf932cdf2096d57a0f22189ca9defdf3a15d4b674 (patch)
treef9ca557b231c1e17b6572e3d3a1c72187861dd12 /libavformat/gifdec.c
parent93481fe5fe092d2646a2ae6cccc4ffaaec5b0297 (diff)
downloadffmpeg-f932cdf2096d57a0f22189ca9defdf3a15d4b674.tar.gz
kill AVImageFormat
Originally committed as revision 6875 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/gifdec.c')
-rw-r--r--libavformat/gifdec.c51
1 files changed, 0 insertions, 51 deletions
diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c
index c70d3d942c..692ca6466d 100644
--- a/libavformat/gifdec.c
+++ b/libavformat/gifdec.c
@@ -20,8 +20,6 @@
*/
#include "avformat.h"
-int gif_write(ByteIOContext *pb, AVImageInfo *info);
-
//#define DEBUG
#define MAXBITS 12
@@ -144,17 +142,6 @@ static int gif_video_probe(AVProbeData * pd)
return 0;
}
-static int gif_image_probe(AVProbeData * pd)
-{
- if (pd->buf_size >= 24 &&
- (memcmp(pd->buf, gif87a_sig, 6) == 0 ||
- memcmp(pd->buf, gif89a_sig, 6) == 0))
- return AVPROBE_SCORE_MAX - 1;
- else
- return 0;
-}
-
-
static void GLZWDecodeInit(GifState * s, int csize)
{
/* read buffer */
@@ -594,33 +581,6 @@ static int gif_read_close(AVFormatContext *s1)
return 0;
}
-/* read gif as image */
-static int gif_read(ByteIOContext *f,
- int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque)
-{
- GifState s1, *s = &s1;
- AVImageInfo info1, *info = &info1;
- int ret;
-
- memset(s, 0, sizeof(GifState));
- s->f = f;
- if (gif_read_header1(s) < 0)
- return -1;
- info->width = s->screen_width;
- info->height = s->screen_height;
- info->pix_fmt = PIX_FMT_PAL8;
- ret = alloc_cb(opaque, info);
- if (ret)
- return ret;
- s->image_buf = info->pict.data[0];
- s->image_linesize = info->pict.linesize[0];
- s->image_palette = (uint32_t *)info->pict.data[1];
-
- if (gif_parse_next_image(s) < 0)
- return -1;
- return 0;
-}
-
AVInputFormat gif_demuxer =
{
"gif",
@@ -631,14 +591,3 @@ AVInputFormat gif_demuxer =
gif_read_packet,
gif_read_close,
};
-
-AVImageFormat gif_image_format = {
- "gif",
- "gif",
- gif_image_probe,
- gif_read,
- (1 << PIX_FMT_PAL8),
-#ifdef CONFIG_GIF_MUXER
- gif_write,
-#endif
-};