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/video_out/video_out_aa.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/video_out/video_out_aa.c')
| -rw-r--r-- | src/video_out/video_out_aa.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 5323c3a5e..d2b488f5b 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -87,12 +87,9 @@ static uint32_t aa_get_capabilities (vo_driver_t *this) { static void aa_dispose_frame (vo_frame_t *vo_img) { aa_frame_t *frame = (aa_frame_t *)vo_img; - if (frame->mem[0]) - free (frame->mem[0]); - if (frame->mem[1]) - free (frame->mem[1]); - if (frame->mem[2]) - free (frame->mem[2]); + free (frame->mem[0]); + free (frame->mem[1]); + free (frame->mem[2]); free (frame); } @@ -132,19 +129,9 @@ static void aa_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img, if ((frame->width != width) || (frame->height != height) || (frame->format != format)) { - if (frame->mem[0]) { - free (frame->mem[0]); - frame->mem[0] = NULL; - } - if (frame->mem[1]) { - free (frame->mem[1]); - frame->mem[1] = NULL; - } - - if (frame->mem[2]) { - free (frame->mem[2]); - frame->mem[2] = NULL; - } + free (frame->mem[0]); frame->mem[0] = NULL; + free (frame->mem[1]); frame->mem[1] = NULL; + free (frame->mem[2]); frame->mem[2] = NULL; frame->width = width; frame->height = height; |