annotate flic.c @ 2660:022174d849d5 libavformat

fix issue 225, instead of stoping when wrong atom size is found, limit atom size to what is left, assuming container atom has correct size.. cricket4.3g2 has incorrect moov atom size which indicates that file size should be 2 bytes bigger than it is and quicktime reads it correctly though.
author bcoudurier
date Mon, 22 Oct 2007 14:36:14 +0000
parents 91b61b76eb8c
children d52c718e83f9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
1 /*
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
2 * FLI/FLC Animation File Demuxer
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
3 * Copyright (c) 2003 The ffmpeg Project
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
15 * Lesser General Public License for more details.
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
16 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
20 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
21
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
22 /**
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
23 * @file flic.c
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
24 * FLI/FLC file demuxer
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
25 * by Mike Melanson (melanson@pcisys.net)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
26 * for more information on the .fli/.flc file format and all of its many
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
27 * variations, visit:
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
28 * http://www.compuphase.com/flic.htm
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
29 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
30 * This demuxer handles standard 0xAF11- and 0xAF12-type FLIs. It also
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
31 * handles special FLIs from the PC game "Magic Carpet".
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
32 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
33
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
34 #include "avformat.h"
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
35
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
36 #define FLIC_FILE_MAGIC_1 0xAF11
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
37 #define FLIC_FILE_MAGIC_2 0xAF12
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
38 #define FLIC_FILE_MAGIC_3 0xAF44 /* Flic Type for Extended FLX Format which
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
39 originated in Dave's Targa Animator (DTA) */
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
40 #define FLIC_CHUNK_MAGIC_1 0xF1FA
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
41 #define FLIC_CHUNK_MAGIC_2 0xF5FA
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
42 #define FLIC_MC_SPEED 5 /* speed for Magic Carpet game FLIs */
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
43 #define FLIC_DEFAULT_SPEED 5 /* for FLIs that have 0 speed */
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
44
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
45 #define FLIC_HEADER_SIZE 128
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
46 #define FLIC_PREAMBLE_SIZE 6
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
47
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
48 typedef struct FlicDemuxContext {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
49 int video_stream_index;
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
50 int frame_number;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
51 } FlicDemuxContext;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
52
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
53 static int flic_probe(AVProbeData *p)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
54 {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
55 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
56
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
57 magic_number = AV_RL16(&p->buf[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
58 if ((magic_number != FLIC_FILE_MAGIC_1) &&
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
59 (magic_number != FLIC_FILE_MAGIC_2) &&
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
60 (magic_number != FLIC_FILE_MAGIC_3))
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
61 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
62
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
63 return AVPROBE_SCORE_MAX;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
64 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
65
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
66 static int flic_read_header(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
67 AVFormatParameters *ap)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
68 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
69 FlicDemuxContext *flic = s->priv_data;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
70 ByteIOContext *pb = &s->pb;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
71 unsigned char header[FLIC_HEADER_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
72 AVStream *st;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
73 int speed;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
74 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
75
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
76 flic->frame_number = 0;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
77
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
78 /* load the whole header and pull out the width and height */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
79 if (get_buffer(pb, header, FLIC_HEADER_SIZE) != FLIC_HEADER_SIZE)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
80 return AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
81
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
82 magic_number = AV_RL16(&header[4]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
83 speed = AV_RL32(&header[0x10]);
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
84 if (speed == 0)
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
85 speed = FLIC_DEFAULT_SPEED;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
86
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
87 /* initialize the decoder streams */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
88 st = av_new_stream(s, 0);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
89 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2006
diff changeset
90 return AVERROR(ENOMEM);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
91 flic->video_stream_index = st->index;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
92 st->codec->codec_type = CODEC_TYPE_VIDEO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
93 st->codec->codec_id = CODEC_ID_FLIC;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
94 st->codec->codec_tag = 0; /* no fourcc */
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
95 st->codec->width = AV_RL16(&header[0x08]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
96 st->codec->height = AV_RL16(&header[0x0A]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
97
2385
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
98 if (!st->codec->width || !st->codec->height) {
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
99 /* Ugly hack needed for the following sample: */
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
100 /* http://samples.mplayerhq.hu/fli-flc/fli-bugs/specular.flc */
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
101 av_log(s, AV_LOG_WARNING,
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
102 "File with no specified width/height. Trying 640x480.\n");
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
103 st->codec->width = 640;
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
104 st->codec->height = 480;
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
105 }
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
106
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
107 /* send over the whole 128-byte FLIC header */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
108 st->codec->extradata_size = FLIC_HEADER_SIZE;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
109 st->codec->extradata = av_malloc(FLIC_HEADER_SIZE);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
110 memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
111
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
112 /* Time to figure out the framerate: If there is a FLIC chunk magic
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
113 * number at offset 0x10, assume this is from the Bullfrog game,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
114 * Magic Carpet. */
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
115 if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
116
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
117 av_set_pts_info(st, 64, FLIC_MC_SPEED, 70);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
118
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
119 /* rewind the stream since the first chunk is at offset 12 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
120 url_fseek(pb, 12, SEEK_SET);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
121
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
122 /* send over abbreviated FLIC header chunk */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
123 av_free(st->codec->extradata);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
124 st->codec->extradata_size = 12;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
125 st->codec->extradata = av_malloc(12);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
126 memcpy(st->codec->extradata, header, 12);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
127
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
128 } else if (magic_number == FLIC_FILE_MAGIC_1) {
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
129 av_set_pts_info(st, 64, speed, 70);
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
130 } else if ((magic_number == FLIC_FILE_MAGIC_2) ||
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
131 (magic_number == FLIC_FILE_MAGIC_3)) {
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
132 av_set_pts_info(st, 64, speed, 1000);
1801
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
133 } else {
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
134 av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n");
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
135 return AVERROR_INVALIDDATA;
1801
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
136 }
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
137
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
138 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
139 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
140
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
141 static int flic_read_packet(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
142 AVPacket *pkt)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
143 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
144 FlicDemuxContext *flic = s->priv_data;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
145 ByteIOContext *pb = &s->pb;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
146 int packet_read = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
147 unsigned int size;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
148 int magic;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
149 int ret = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
150 unsigned char preamble[FLIC_PREAMBLE_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
151
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
152 while (!packet_read) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
153
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
154 if ((ret = get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE)) !=
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
155 FLIC_PREAMBLE_SIZE) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
156 ret = AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
157 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
158 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
159
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
160 size = AV_RL32(&preamble[0]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
161 magic = AV_RL16(&preamble[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
162
643
253b5292946a various security fixes and precautionary checks
michael
parents: 482
diff changeset
163 if (((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) && size > FLIC_PREAMBLE_SIZE) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
164 if (av_new_packet(pkt, size)) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
165 ret = AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
166 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
167 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
168 pkt->stream_index = flic->video_stream_index;
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
169 pkt->pts = flic->frame_number++;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
170 pkt->pos = url_ftell(pb);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
171 memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
172 ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE,
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
173 size - FLIC_PREAMBLE_SIZE);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
174 if (ret != size - FLIC_PREAMBLE_SIZE) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
175 av_free_packet(pkt);
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
176 ret = AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
177 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
178 packet_read = 1;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
179 } else {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
180 /* not interested in this chunk */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
181 url_fseek(pb, size - 6, SEEK_CUR);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
182 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
183 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
184
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
185 return ret;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
186 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
187
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
188 static int flic_read_close(AVFormatContext *s)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
189 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
190 // FlicDemuxContext *flic = s->priv_data;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
191
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
192 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
193 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
194
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
195 AVInputFormat flic_demuxer = {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
196 "flic",
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
197 "FLI/FLC/FLX animation format",
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
198 sizeof(FlicDemuxContext),
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
199 flic_probe,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
200 flic_read_header,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
201 flic_read_packet,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
202 flic_read_close,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
203 };