diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2004-09-14 22:13:44 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2004-09-14 22:13:44 +0000 |
| commit | 1e565c6a1b0c4b52557a172fcd7ef8bc1450f908 (patch) | |
| tree | 37502801ea2524052d7070e10e25cf4f0f081ec6 | |
| parent | ae10c5de672de5d27714a54862a910566dd2da14 (diff) | |
| download | xine-lib-1e565c6a1b0c4b52557a172fcd7ef8bc1450f908.tar.gz xine-lib-1e565c6a1b0c4b52557a172fcd7ef8bc1450f908.tar.bz2 | |
Fix palette based codecs
CVS patchset: 6971
CVS date: 2004/09/14 22:13:44
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index d3e6138ac..aa165a172 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.31 2004/09/14 02:22:30 hadess Exp $ + * $Id: video_decoder.c,v 1.32 2004/09/14 22:13:44 jstembridge Exp $ * * xine video decoder plugin using ffmpeg * @@ -204,8 +204,6 @@ static void init_video_codec (ff_video_decoder_t *this) { */ this->context->pix_fmt = -1; - this->context->palctrl = &this->palette_control; - /* Some codecs (eg rv10) copy flags in init so it's necessary to set * this flag here in case we are going to use direct rendering */ if(this->codec->capabilities & CODEC_CAP_DR1) { @@ -1188,6 +1186,7 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, this->av_frame = avcodec_alloc_frame(); this->context = avcodec_alloc_context(); this->context->opaque = this; + this->context->palctrl = &this->palette_control; this->decoder_ok = 0; this->buf = xine_xmalloc(VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE); |