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/rgb.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/rgb.c')
| -rw-r--r-- | src/libxinevdec/rgb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 85307b155..1cf61febe 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -140,8 +140,7 @@ static void rgb_decode_data (video_decoder_t *this_gen, this->bytes_per_pixel = (this->bit_depth + 1) / 8; - if (this->buf) - free (this->buf); + free (this->buf); /* minimal buffer size */ this->bufsize = this->width * this->height * this->bytes_per_pixel; @@ -381,10 +380,7 @@ static void rgb_discontinuity (video_decoder_t *this_gen) { static void rgb_dispose (video_decoder_t *this_gen) { rgb_decoder_t *this = (rgb_decoder_t *) this_gen; - if (this->buf) { - free (this->buf); - this->buf = NULL; - } + free (this->buf); if (this->decoder_ok) { this->decoder_ok = 0; |