annotate loader/ext.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 9e739bdb049c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15166
f5537cc95b02 Mark modified imported files as such to comply with GPL ¡ø2a.
diego
parents: 7386
diff changeset
1 /*
18783
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 15166
diff changeset
2 * Modified for use with MPlayer, detailed changelog at
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 15166
diff changeset
3 * http://svn.mplayerhq.hu/mplayer/trunk/
15166
f5537cc95b02 Mark modified imported files as such to comply with GPL ¡ø2a.
diego
parents: 7386
diff changeset
4 */
f5537cc95b02 Mark modified imported files as such to comply with GPL ¡ø2a.
diego
parents: 7386
diff changeset
5
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25869
diff changeset
6 #ifndef MPLAYER_EXT_H
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25869
diff changeset
7 #define MPLAYER_EXT_H
1307
d8c1b0b38edc Add prototypes to wine/loader stuff, so that we can catch __stdcall function
jkeil
parents:
diff changeset
8
7386
174e2a58b4cd avifile sync - 95% cosmetics 5% bug
arpi
parents: 2139
diff changeset
9 #include "wine/windef.h"
1307
d8c1b0b38edc Add prototypes to wine/loader stuff, so that we can catch __stdcall function
jkeil
parents:
diff changeset
10
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
11 LPVOID FILE_dommap( int unix_handle, LPVOID start,
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
12 DWORD size_high, DWORD size_low,
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
13 DWORD offset_high, DWORD offset_low,
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
14 int prot, int flags );
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
15 int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low );
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
16 int wcsnicmp( const unsigned short* s1, const unsigned short* s2, int n );
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26045
diff changeset
17 int __vprintf( const char *format, ... );
1307
d8c1b0b38edc Add prototypes to wine/loader stuff, so that we can catch __stdcall function
jkeil
parents:
diff changeset
18
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25869
diff changeset
19 #endif /* MPLAYER_EXT_H */