[FFmpeg-cvslog] Remove some forgotten AVCodecContext.palctrl usage.
Anton Khirnov
git at videolan.org
Wed Sep 21 21:34:05 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Sep 1 17:01:53 2011 +0200| [609a2fa1faa82da2451191170ce1807c9a1ba8a8] | committer: Anton Khirnov
Remove some forgotten AVCodecContext.palctrl usage.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=609a2fa1faa82da2451191170ce1807c9a1ba8a8
---
libavcodec/options.c | 2 --
libavformat/mov.c | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 6469ea7..ef711bf 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -536,7 +536,6 @@ void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_typ
s->pix_fmt= PIX_FMT_NONE;
s->sample_fmt= AV_SAMPLE_FMT_NONE;
- s->palctrl = NULL;
s->reget_buffer= avcodec_default_reget_buffer;
s->reordered_opaque= AV_NOPTS_VALUE;
}
@@ -615,7 +614,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
/* set values specific to opened codecs back to their default state */
dest->priv_data = NULL;
dest->codec = NULL;
- dest->palctrl = NULL;
dest->slice_offset = NULL;
dest->internal_buffer = NULL;
dest->hwaccel = NULL;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 35cd9a8..3190afd 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2591,8 +2591,6 @@ static int mov_read_close(AVFormatContext *s)
av_freep(&sc->drefs);
if (sc->pb && sc->pb != s->pb)
avio_close(sc->pb);
-
- av_freep(&st->codec->palctrl);
}
if (mov->dv_demux) {
More information about the ffmpeg-cvslog
mailing list