Mercurial > mplayer.hg
annotate loader/loader.h @ 36316:139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
Instead, differentiate between the original aspect ratio stored in or
determined from the video file and the forced, i.e. current, aspect
ratio (e.g. forced by command line override).
This enables multiple independent instances of vd.c again which has
been broken by introducing a static variable in r36401.
Without the subsequent calculation of original_aspect it now contains
nothing but the pure video file aspect ratio which makes it possible
to use movie_aspect -1 to set the original aspect ratio which explains
the changes in command.c and gui/dialog/menu.c.
The changes in vd_mpegpes due to the impact of original_aspect will
fix a bug there at the same time where the condition in order to call
mpcodecs_config_vo() should only trigger once when the encoded aspect
changes. So far, the forced, i.e. current, aspect has been checked.
The whole is related to enabling special argument -1 to switch_ratio
started in r36391.
author | ib |
---|---|
date | Wed, 07 Aug 2013 20:41:34 +0000 |
parents | db0bb7511440 |
children |
rev | line source |
---|---|
1 | 1 /******************************************************** |
2 | |
3 Win32 binary loader interface | |
128 | 4 Copyright 2000 Eugene Kuznetsov (divx@euro.ru) |
1 | 5 Shamelessly stolen from Wine project |
6 | |
7 *********************************************************/ | |
8 | |
15166
f5537cc95b02
Mark modified imported files as such to comply with GPL ¡ø2a.
diego
parents:
7386
diff
changeset
|
9 /* |
18783 | 10 * Modified for use with MPlayer, detailed changelog at |
11 * http://svn.mplayerhq.hu/mplayer/trunk/ | |
15166
f5537cc95b02
Mark modified imported files as such to comply with GPL ¡ø2a.
diego
parents:
7386
diff
changeset
|
12 */ |
f5537cc95b02
Mark modified imported files as such to comply with GPL ¡ø2a.
diego
parents:
7386
diff
changeset
|
13 |
26045 | 14 #ifndef MPLAYER_LOADER_H |
15 #define MPLAYER_LOADER_H | |
7386 | 16 |
17 #include "wine/windef.h" | |
18 #include "wine/driver.h" | |
19 #include "wine/mmreg.h" | |
20 #include "wine/vfw.h" | |
21 #include "wine/msacm.h" | |
32077
db0bb7511440
Move local_wm extern variable declaration to loader.h, which is better suited.
diego
parents:
30496
diff
changeset
|
22 #include "wine/module.h" |
db0bb7511440
Move local_wm extern variable declaration to loader.h, which is better suited.
diego
parents:
30496
diff
changeset
|
23 |
db0bb7511440
Move local_wm extern variable declaration to loader.h, which is better suited.
diego
parents:
30496
diff
changeset
|
24 |
db0bb7511440
Move local_wm extern variable declaration to loader.h, which is better suited.
diego
parents:
30496
diff
changeset
|
25 extern modref_list* local_wm; |
1494 | 26 |
25794
2c8cdb9123b8
Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
diego
parents:
24422
diff
changeset
|
27 unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, int default_value, const char* filename); |
2c8cdb9123b8
Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
diego
parents:
24422
diff
changeset
|
28 int GetPrivateProfileStringA_(const char* appname, const char* keyname, |
1 | 29 const char* def_val, char* dest, unsigned int len, const char* filename); |
25794
2c8cdb9123b8
Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
diego
parents:
24422
diff
changeset
|
30 int WritePrivateProfileStringA_(const char* appname, const char* keyname, |
1 | 31 const char* string, const char* filename); |
32 | |
1307
d8c1b0b38edc
Add prototypes to wine/loader stuff, so that we can catch __stdcall function
jkeil
parents:
128
diff
changeset
|
33 INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, |
d8c1b0b38edc
Add prototypes to wine/loader stuff, so that we can catch __stdcall function
jkeil
parents:
128
diff
changeset
|
34 LPSTR buffer, INT buflen ); |
128 | 35 |
26045 | 36 #endif /* MPLAYER_LOADER_H */ |