annotate flic.c @ 2239:3682caa1584b libavformat

duration must not be scaled
author aurel
date Mon, 09 Jul 2007 13:51:06 +0000
parents 2f0154760e5f
children 7eb456c4ed8a
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
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
42 #define FLIC_MC_PTS_INC 6000 /* pts increment for Magic Carpet game FLIs */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
43 #define FLIC_DEFAULT_PTS_INC 6000 /* for FLIs that have 0 speed */
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 frame_pts_inc;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
50 int64_t pts;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
51 int video_stream_index;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
52 } FlicDemuxContext;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
53
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
54 static int flic_probe(AVProbeData *p)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
55 {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
56 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
57
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
58 magic_number = AV_RL16(&p->buf[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
59 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
60 (magic_number != FLIC_FILE_MAGIC_2) &&
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
61 (magic_number != FLIC_FILE_MAGIC_3))
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
62 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
63
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
64 return AVPROBE_SCORE_MAX;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
65 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
66
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
67 static int flic_read_header(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
68 AVFormatParameters *ap)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
69 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
70 FlicDemuxContext *flic = s->priv_data;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
71 ByteIOContext *pb = &s->pb;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
72 unsigned char header[FLIC_HEADER_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
73 AVStream *st;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
74 int speed;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
75 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
76
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
77 flic->pts = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
78
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
79 /* load the whole header and pull out the width and height */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
80 if (get_buffer(pb, header, FLIC_HEADER_SIZE) != FLIC_HEADER_SIZE)
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
81 return AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
82
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
83 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
84 speed = AV_RL32(&header[0x10]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
85
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
86 /* initialize the decoder streams */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
87 st = av_new_stream(s, 0);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
88 if (!st)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
89 return AVERROR_NOMEM;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
90 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
91 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
92 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
93 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
94 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
95 st->codec->height = AV_RL16(&header[0x0A]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
96
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
97 if (!st->codec->width || !st->codec->height)
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
98 return AVERROR_INVALIDDATA;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
99
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
100 /* 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
101 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
102 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
103 memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
104
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 386
diff changeset
105 av_set_pts_info(st, 33, 1, 90000);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
106
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
107 /* Time to figure out the framerate: If there is a FLIC chunk magic
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
108 * number at offset 0x10, assume this is from the Bullfrog game,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
109 * Magic Carpet. */
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
110 if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
111
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
112 flic->frame_pts_inc = FLIC_MC_PTS_INC;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
113
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
114 /* rewind the stream since the first chunk is at offset 12 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
115 url_fseek(pb, 12, SEEK_SET);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
116
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
117 /* 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
118 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
119 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
120 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
121 memcpy(st->codec->extradata, header, 12);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
122
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
123 } else if (magic_number == FLIC_FILE_MAGIC_1) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
124 /*
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
125 * in this case, the speed (n) is number of 1/70s ticks between frames:
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
126 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
127 * pts n * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
128 * -------- = ----------- => pts = n * (90000/70) * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
129 * 90000 70
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
130 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
131 * therefore, the frame pts increment = n * 1285.7
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
132 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
133 flic->frame_pts_inc = speed * 1285.7;
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
134 } 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
135 (magic_number == FLIC_FILE_MAGIC_3)) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
136 /*
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
137 * in this case, the speed (n) is number of milliseconds between frames:
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
138 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
139 * pts n * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
140 * -------- = ----------- => pts = n * 90 * frame #
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
141 * 90000 1000
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
142 *
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
143 * therefore, the frame pts increment = n * 90
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
144 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
145 flic->frame_pts_inc = speed * 90;
1801
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
146 } else {
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
147 av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n");
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
148 return AVERROR_INVALIDDATA;
1801
9cd35d039830 spit an error message in case of invalid chunk
alex
parents: 1673
diff changeset
149 }
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
150
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
151 if (flic->frame_pts_inc == 0)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
152 flic->frame_pts_inc = FLIC_DEFAULT_PTS_INC;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
153
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
154 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
155 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
156
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
157 static int flic_read_packet(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
158 AVPacket *pkt)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
159 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
160 FlicDemuxContext *flic = s->priv_data;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
161 ByteIOContext *pb = &s->pb;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
162 int packet_read = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
163 unsigned int size;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
164 int magic;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
165 int ret = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
166 unsigned char preamble[FLIC_PREAMBLE_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
167
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
168 while (!packet_read) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
169
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
170 if ((ret = get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE)) !=
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
171 FLIC_PREAMBLE_SIZE) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
172 ret = AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
173 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
174 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
175
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
176 size = AV_RL32(&preamble[0]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
177 magic = AV_RL16(&preamble[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
178
643
253b5292946a various security fixes and precautionary checks
michael
parents: 482
diff changeset
179 if (((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) && size > FLIC_PREAMBLE_SIZE) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
180 if (av_new_packet(pkt, size)) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
181 ret = AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
182 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
183 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
184 pkt->stream_index = flic->video_stream_index;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
185 pkt->pts = flic->pts;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
186 pkt->pos = url_ftell(pb);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
187 memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
188 ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE,
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
189 size - FLIC_PREAMBLE_SIZE);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
190 if (ret != size - FLIC_PREAMBLE_SIZE) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
191 av_free_packet(pkt);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
192 ret = AVERROR_IO;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
193 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
194 flic->pts += flic->frame_pts_inc;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
195 packet_read = 1;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
196 } else {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
197 /* not interested in this chunk */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
198 url_fseek(pb, size - 6, SEEK_CUR);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
199 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
200 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
201
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
202 return ret;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
203 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
204
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
205 static int flic_read_close(AVFormatContext *s)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
206 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
207 // FlicDemuxContext *flic = s->priv_data;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
208
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
209 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
210 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
211
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
212 AVInputFormat flic_demuxer = {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
213 "flic",
864
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
214 "FLI/FLC/FLX animation format",
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
215 sizeof(FlicDemuxContext),
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
216 flic_probe,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
217 flic_read_header,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
218 flic_read_packet,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
219 flic_read_close,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
220 };