Mercurial > mplayer.hg

annotate libmpcodecs/ve.h @ 35123:bf46a9b2abda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set ass margins only from one single locations. This fixes the different settings from e.g. vo and -ass-margin options fighting against each other. To allow this to work, apply the global option values on top of the vo values. If this is the most desirable behaviour is up to discussion, but it seems reasonable and is the easiest way to solve this.
author reimar
date Wed, 26 Sep 2012 20:16:38 +0000
parents af9ef007bec6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31456
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
1 /*
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
2 * This file is part of MPlayer.
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
3 *
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
7 * (at your option) any later version.
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
8 *
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
12 * GNU General Public License for more details.
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
13 *
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License along
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
17 */
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
18
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
19 #ifndef MPLAYER_VE_H
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
20 #define MPLAYER_VE_H
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
21
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
22 #include "m_option.h"
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
23
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
24 extern const m_option_t lavcopts_conf[];
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
25 extern const m_option_t vfwopts_conf[];
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
26 extern const m_option_t xvidencopts_conf[];
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
27
32017
922a375ec4af Move lavc_param_* extern declarations to ve.h.
diego
parents: 31456
diff changeset
28 extern char *lavc_param_acodec;
922a375ec4af Move lavc_param_* extern declarations to ve.h.
diego
parents: 31456
diff changeset
29 extern char *lavc_param_audio_avopt;
922a375ec4af Move lavc_param_* extern declarations to ve.h.
diego
parents: 31456
diff changeset
30 extern int lavc_param_abitrate;
922a375ec4af Move lavc_param_* extern declarations to ve.h.
diego
parents: 31456
diff changeset
31 extern int lavc_param_atag;
922a375ec4af Move lavc_param_* extern declarations to ve.h.
diego
parents: 31456
diff changeset
32 extern int lavc_param_audio_global_header;
922a375ec4af Move lavc_param_* extern declarations to ve.h.
diego
parents: 31456
diff changeset
33
32476
af9ef007bec6 Add the -force-key-frames option.
cigaes
parents: 32017
diff changeset
34 int parse_forced_key_frames(const m_option_t *opt, const char *arg);
af9ef007bec6 Add the -force-key-frames option.
cigaes
parents: 32017
diff changeset
35 int is_forced_key_frame(double pts);
af9ef007bec6 Add the -force-key-frames option.
cigaes
parents: 32017
diff changeset
36
31456
99800c647f77 Add header file for video encoder extern variable declarations.
diego
parents:
diff changeset
37 #endif /* MPLAYER_VE_H */