diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-17 22:24:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-17 22:24:36 +0000 |
| commit | 01f4895c682a1752bf6d138ffb0628470e16b85a (patch) | |
| tree | 56a3dfce270dad38b97c8f7ff288cc23cfac54da /libavformat/flic.c | |
| parent | 4c1a012e9ceb0840688c547625208e7c4b81624a (diff) | |
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flic.c')
| -rw-r--r-- | libavformat/flic.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/flic.c b/libavformat/flic.c index 3fa27335db..d53168dc98 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -86,19 +86,19 @@ static int flic_read_header(AVFormatContext *s, if (!st) return AVERROR_NOMEM; flic->video_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = CODEC_ID_FLIC; - st->codec.codec_tag = 0; /* no fourcc */ - st->codec.width = LE_16(&header[0x08]); - st->codec.height = LE_16(&header[0x0A]); + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_FLIC; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = LE_16(&header[0x08]); + st->codec->height = LE_16(&header[0x0A]); - if (!st->codec.width || !st->codec.height) + if (!st->codec->width || !st->codec->height) return AVERROR_INVALIDDATA; /* send over the whole 128-byte FLIC header */ - st->codec.extradata_size = FLIC_HEADER_SIZE; - st->codec.extradata = av_malloc(FLIC_HEADER_SIZE); - memcpy(st->codec.extradata, header, FLIC_HEADER_SIZE); + st->codec->extradata_size = FLIC_HEADER_SIZE; + st->codec->extradata = av_malloc(FLIC_HEADER_SIZE); + memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE); av_set_pts_info(st, 33, 1, 90000); @@ -113,10 +113,10 @@ static int flic_read_header(AVFormatContext *s, url_fseek(pb, 12, SEEK_SET); /* send over abbreviated FLIC header chunk */ - av_free(st->codec.extradata); - st->codec.extradata_size = 12; - st->codec.extradata = av_malloc(12); - memcpy(st->codec.extradata, header, 12); + av_free(st->codec->extradata); + st->codec->extradata_size = 12; + st->codec->extradata = av_malloc(12); + memcpy(st->codec->extradata, header, 12); } else if (magic_number == FLIC_FILE_MAGIC_1) { /* |