Mercurial > mplayer.hg

annotate sub/av_sub.h @ 36316:139f2b064ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f4822d5572f5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
32457
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
1 /*
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
2 * This file is part of MPlayer.
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
3 *
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
7 * (at your option) any later version.
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
8 *
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
12 * GNU General Public License for more details.
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
13 *
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License along
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
17 */
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
18
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
19 #ifndef MPLAYER_AV_SUB_H
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
20 #define MPLAYER_AV_SUB_H
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
21
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
22 #include <stdint.h>
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
23
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
24 struct sh_sub;
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
25
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
26 void reset_avsub(struct sh_sub *sh);
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
27 int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size,
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
28 double *pts, double *endpts);
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
29
f4822d5572f5 Move av_sub.[ch] to the sub directory.
cigaes
parents:
diff changeset
30 #endif /* MPLAYER_AV_SUB_H */