Mercurial > mplayer.hg
comparison libvo/vo_vdpau.c @ 36371:bbf289ad03f2
vo_vdpau: Initialize variables before, not after setup code.
Fixes possible crashes when playing multiple videos without
-fixed-vo.
| author | reimar |
|---|---|
| date | Tue, 15 Oct 2013 18:58:55 +0000 |
| parents | 9de70162224b |
| children | c69eaba13338 |
comparison
equal
deleted
inserted
replaced
| 36370:3cc8224f3c6c | 36371:bbf289ad03f2 |
|---|---|
| 1288 mp_msg(MSGT_VO, MSGL_WARN, "[vdpau] Invalid color space specified, " | 1288 mp_msg(MSGT_VO, MSGL_WARN, "[vdpau] Invalid color space specified, " |
| 1289 "using BT.601\n"); | 1289 "using BT.601\n"); |
| 1290 colorspace = 1; | 1290 colorspace = 1; |
| 1291 } | 1291 } |
| 1292 | 1292 |
| 1293 if (!vo_init() || win_x11_init_vdpau_procs()) | |
| 1294 return -1; | |
| 1295 | |
| 1296 // full grayscale palette. | 1293 // full grayscale palette. |
| 1297 for (i = 0; i < PALETTE_SIZE; ++i) | 1294 for (i = 0; i < PALETTE_SIZE; ++i) |
| 1298 palette[i] = (i << 16) | (i << 8) | i; | 1295 palette[i] = (i << 16) | (i << 8) | i; |
| 1299 index_data = NULL; | 1296 index_data = NULL; |
| 1300 index_data_size = 0; | 1297 index_data_size = 0; |
| 1306 procamp.struct_version = VDP_PROCAMP_VERSION; | 1303 procamp.struct_version = VDP_PROCAMP_VERSION; |
| 1307 procamp.brightness = 0.0; | 1304 procamp.brightness = 0.0; |
| 1308 procamp.contrast = 1.0; | 1305 procamp.contrast = 1.0; |
| 1309 procamp.saturation = 1.0; | 1306 procamp.saturation = 1.0; |
| 1310 procamp.hue = 0.0; | 1307 procamp.hue = 0.0; |
| 1308 | |
| 1309 if (!vo_init() || win_x11_init_vdpau_procs()) | |
| 1310 return -1; | |
| 1311 | 1311 |
| 1312 return 0; | 1312 return 0; |
| 1313 } | 1313 } |
| 1314 | 1314 |
| 1315 static int get_equalizer(const char *name, int *value) | 1315 static int get_equalizer(const char *name, int *value) |