github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Code Releases Activity

Merge svn changes up to r31100

Browse Source
This commit is contained in:
Uoti Urpala 2010-05-07 20:59:01 +03:00
commit a817e69131
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/xml/en/mencoder.xml
View File

@ -615,7 +615,7 @@ mencoder mf://<replaceable>@list.txt</replaceable> -mf w=800:h=600:fps=25:type=j
</informalexample>
You can mix different types of images, regardless of the method you use
t &mdash; individual filenames, wildcard or file with list &mdash; provided of
&mdash; individual filenames, wildcard or file with list &mdash; provided of
course they have the same dimensions.
So you can e.g. take title frame from PNG file,
and then put a slideshow of your JPEG photos.

2
configure vendored
View File

@ -7728,7 +7728,7 @@ if test "$_largefiles" = yes || freebsd ; then
fi
fi
CXXFLAGS=" $CFLAGS -Iffmpeg -D__STDC_LIMIT_MACROS"
CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
# This must be the last test to be performed. Any other tests following it
# could fail due to linker errors. libdvdnavmini is intentionally not linked

2
libvo/x11_common.c
View File

@ -336,9 +336,9 @@ static void init_atoms(struct vo_x11_state *x11)
void update_xinerama_info(struct vo *vo) {
struct MPOpts *opts = vo->opts;
int screen = xinerama_screen;
xinerama_x = xinerama_y = 0;
#ifdef CONFIG_XINERAMA
int screen = xinerama_screen;
if (screen >= -1 && XineramaIsActive(vo->x11->display))
{
XineramaScreenInfo *screens;