diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-15 09:44:57 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-15 09:44:57 +0000 |
| commit | e49da8273be326b77d082a2060be2bfd86769bb1 (patch) | |
| tree | 0efa1d55bf75fc9fb8741443400b9fabc2ec2662 | |
| parent | 6c00a9dec2ad3f2399e1e4f6f9b2908ec28302ca (diff) | |
allocate palette in codec directly
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/isom.h | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index edf860bc8a..ecfa83c150 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -126,7 +126,6 @@ typedef struct MOVContext { int64_t duration; /* duration of the longest track */ int found_moov; /* when both 'moov' and 'mdat' sections has been found */ int found_mdat; /* we suppose we have enough data to read the file */ - AVPaletteControl palette_control; DVDemuxContext *dv_demux; AVFormatContext *dv_fctx; int isom; /* 1 if file is ISO Media (mp4/3gp) */ diff --git a/libavformat/mov.c b/libavformat/mov.c index 0c9381f053..cbd9e5f16c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -754,6 +754,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) unsigned int color_start, color_count, color_end; unsigned char r, g, b; + st->codec->palctrl = av_malloc(sizeof(*st->codec->palctrl)); if (color_greyscale) { int color_index, color_dec; /* compute the greyscale palette */ @@ -763,7 +764,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) color_dec = 256 / (color_count - 1); for (j = 0; j < color_count; j++) { r = g = b = color_index; - c->palette_control.palette[j] = + st->codec->palctrl->palette[j] = (r << 16) | (g << 8) | (b); color_index -= color_dec; if (color_index < 0) @@ -784,7 +785,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) r = color_table[j * 4 + 0]; g = color_table[j * 4 + 1]; b = color_table[j * 4 + 2]; - c->palette_control.palette[j] = + st->codec->palctrl->palette[j] = (r << 16) | (g << 8) | (b); } } else { @@ -806,15 +807,13 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) get_byte(pb); b = get_byte(pb); get_byte(pb); - c->palette_control.palette[j] = + st->codec->palctrl->palette[j] = (r << 16) | (g << 8) | (b); } } } - st->codec->palctrl = &c->palette_control; st->codec->palctrl->palette_changed = 1; - } else - st->codec->palctrl = NULL; + } } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) { int bits_per_sample, flags; uint16_t version = get_be16(pb); @@ -2000,7 +1999,8 @@ static int mov_read_close(AVFormatContext *s) int i, j; for (i = 0; i < s->nb_streams; i++) { - MOVStreamContext *sc = s->streams[i]->priv_data; + AVStream *st = s->streams[i]; + MOVStreamContext *sc = st->priv_data; av_freep(&sc->ctts_data); for (j = 0; j < sc->drefs_count; j++) @@ -2008,6 +2008,8 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->drefs); if (sc->pb && sc->pb != s->pb) url_fclose(sc->pb); + + av_freep(&st->codec->palctrl); } if (mov->dv_demux) { |