annotate loader/debug.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 a8ea87c71d18
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25553
diff changeset
1 #ifndef MPLAYER_DEBUG_H
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25553
diff changeset
2 #define MPLAYER_DEBUG_H
25553
6ac1ece1f9fe Add multiple inclusion guards to all header files that lack them.
diego
parents: 21261
diff changeset
3
21261
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
4 #ifdef DEBUG
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
5 #define TRACE printf
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
6 #define dbg_printf printf
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
7 #else
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
8 #define TRACE(...)
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
9 #define dbg_printf(...)
a2e02e6b6379 Rename config.h --> debug.h and include config.h explicitly.
diego
parents:
diff changeset
10 #endif
25553
6ac1ece1f9fe Add multiple inclusion guards to all header files that lack them.
diego
parents: 21261
diff changeset
11
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25553
diff changeset
12 #endif /* MPLAYER_DEBUG_H */