annotate flic.c @ 3754:8d267b43eaba libavformat

Move malloc() down until after all initializations, so that the resource is only allocated if initialization worked. This means that on failure, we don't have to deallocate it.
author rbultje
date Sat, 23 Aug 2008 18:46:30 +0000
parents a81d82e21714
children 7d2f3f1b68d8
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
3583
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
57 if(p->buf_size < FLIC_HEADER_SIZE)
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
58 return 0;
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
59
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
60 magic_number = AV_RL16(&p->buf[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
61 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
62 (magic_number != FLIC_FILE_MAGIC_2) &&
00a3ba030166 support for FLX and DTA extensions in the FLIC format, courtesy of
melanson
parents: 820
diff changeset
63 (magic_number != FLIC_FILE_MAGIC_3))
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
64 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
65
3583
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
66 if(AV_RL16(&p->buf[0x10]) != FLIC_CHUNK_MAGIC_1){
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
67 if(AV_RL32(&p->buf[0x10]) > 2000)
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
68 return 0;
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
69 }
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
70
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
71 if( AV_RL16(&p->buf[0x08]) > 4096
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
72 || AV_RL16(&p->buf[0x0A]) > 4096)
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
73 return 0;
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
74
a81d82e21714 Make flic probe check a few more things.
michael
parents: 3484
diff changeset
75
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
76 return AVPROBE_SCORE_MAX;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
77 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
78
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
79 static int flic_read_header(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
80 AVFormatParameters *ap)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
81 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
82 FlicDemuxContext *flic = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2423
diff changeset
83 ByteIOContext *pb = s->pb;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
84 unsigned char header[FLIC_HEADER_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
85 AVStream *st;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
86 int speed;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
87 int magic_number;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
88
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
89 flic->frame_number = 0;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
90
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
91 /* load the whole header and pull out the width and height */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
92 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
93 return AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
94
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
95 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
96 speed = AV_RL32(&header[0x10]);
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
97 if (speed == 0)
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
98 speed = FLIC_DEFAULT_SPEED;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
99
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
100 /* initialize the decoder streams */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
101 st = av_new_stream(s, 0);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
102 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2006
diff changeset
103 return AVERROR(ENOMEM);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
104 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
105 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
106 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
107 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
108 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
109 st->codec->height = AV_RL16(&header[0x0A]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
110
2385
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
111 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
112 /* 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
113 /* 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
114 av_log(s, AV_LOG_WARNING,
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
115 "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
116 st->codec->width = 640;
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
117 st->codec->height = 480;
8a7b2fac0a98 Try size 640x480 for FLC files which don't specify their size.
aurel
parents: 2274
diff changeset
118 }
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
119
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
120 /* 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
121 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
122 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
123 memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
124
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
125 /* Time to figure out the framerate: If there is a FLIC chunk magic
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
126 * number at offset 0x10, assume this is from the Bullfrog game,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
127 * Magic Carpet. */
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
128 if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
129
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
130 av_set_pts_info(st, 64, FLIC_MC_SPEED, 70);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
131
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
132 /* rewind the stream since the first chunk is at offset 12 */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
133 url_fseek(pb, 12, SEEK_SET);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
134
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
135 /* 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
136 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
137 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
138 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
139 memcpy(st->codec->extradata, header, 12);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
140
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
141 } else if (magic_number == FLIC_FILE_MAGIC_1) {
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
142 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
143 } 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
144 (magic_number == FLIC_FILE_MAGIC_3)) {
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
145 av_set_pts_info(st, 64, speed, 1000);
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 return 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
152 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
153
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
154 static int flic_read_packet(AVFormatContext *s,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
155 AVPacket *pkt)
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
156 {
2006
2f0154760e5f Get rid of unnecessary pointer casts.
diego
parents: 2001
diff changeset
157 FlicDemuxContext *flic = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2423
diff changeset
158 ByteIOContext *pb = s->pb;
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
159 int packet_read = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
160 unsigned int size;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
161 int magic;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
162 int ret = 0;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
163 unsigned char preamble[FLIC_PREAMBLE_SIZE];
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
164
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
165 while (!packet_read) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
166
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
167 if ((ret = get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE)) !=
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
168 FLIC_PREAMBLE_SIZE) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
169 ret = AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
170 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
171 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
172
1673
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
173 size = AV_RL32(&preamble[0]);
a782462e2497 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 1358
diff changeset
174 magic = AV_RL16(&preamble[4]);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
175
643
253b5292946a various security fixes and precautionary checks
michael
parents: 482
diff changeset
176 if (((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) && size > FLIC_PREAMBLE_SIZE) {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
177 if (av_new_packet(pkt, size)) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
178 ret = AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
179 break;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
180 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
181 pkt->stream_index = flic->video_stream_index;
2423
91b61b76eb8c simplify PTS handling
melanson
parents: 2385
diff changeset
182 pkt->pts = flic->frame_number++;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
183 pkt->pos = url_ftell(pb);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
184 memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 864
diff changeset
185 ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE,
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
186 size - FLIC_PREAMBLE_SIZE);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
187 if (ret != size - FLIC_PREAMBLE_SIZE) {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
188 av_free_packet(pkt);
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
189 ret = AVERROR(EIO);
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
190 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
191 packet_read = 1;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
192 } else {
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
193 /* not interested in this chunk */
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
194 url_fseek(pb, size - 6, SEEK_CUR);
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
195 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
196 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
197
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
198 return ret;
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
199 }
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
200
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
201 AVInputFormat flic_demuxer = {
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
202 "flic",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 2771
diff changeset
203 NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
315
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
204 sizeof(FlicDemuxContext),
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
205 flic_probe,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
206 flic_read_header,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
207 flic_read_packet,
ff595fc022ff yep, FLI support
melanson
parents:
diff changeset
208 };