diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-11 16:23:37 +0100 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-11 16:23:37 +0100 |
commit | aa43f8f317dc7880d783569921447b3c541db96a (patch) | |
tree | fc047c23ba77cfda7cef7b03761aba64fceef628 /src/libxinevdec/yuv.c | |
parent | 01bd55e4c0d1bf95421d489b9955cd895ccd85e7 (diff) | |
parent | 3df7af4a715ee88c9acbe0136a5d15564a9c10fd (diff) | |
download | xine-lib-aa43f8f317dc7880d783569921447b3c541db96a.tar.gz xine-lib-aa43f8f317dc7880d783569921447b3c541db96a.tar.bz2 |
Merge from 1.2 main branch.
Diffstat (limited to 'src/libxinevdec/yuv.c')
-rw-r--r-- | src/libxinevdec/yuv.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index fea2ca4af..b9856379a 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -104,10 +104,8 @@ static void yuv_decode_data (video_decoder_t *this_gen, this->progressive = buf->decoder_info[3]; this->top_field_first = buf->decoder_info[4]; - if (this->buf) { - free (this->buf); - this->buf = NULL; - } + free (this->buf); + this->buf = NULL; this->bufsize = VIDEOBUFSIZE; this->buf = malloc(this->bufsize); @@ -304,10 +302,7 @@ static void yuv_discontinuity (video_decoder_t *this_gen) { static void yuv_dispose (video_decoder_t *this_gen) { yuv_decoder_t *this = (yuv_decoder_t *) this_gen; - if (this->buf) { - free (this->buf); - this->buf = NULL; - } + free (this->buf); if (this->decoder_ok) { this->decoder_ok = 0; |