Conflicts:

	modules/codec/dmo/dmo.c

 One input buffer can create multiples output ones and so need to be fetched
before provided a new input one.

In this case the option is a bit mis-named but...

Spotted by mc2man, mc2man -- optonline | net
(cherry picked from commit e783877897dcafdcd833f81ba44015ccd0ac482f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This just in: CeGCC has a MinGW with working replacement *printf
functions. Just like for mingw32, require (and allow building with) a
recent enough version of mingwce.

Since MinGW is patched by CeGCC, this check is not strictly sufficient;
but at least this allows to have working WinCE builds again.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

I also removed its use where it cannot/should not happen.

This just in: CeGCC has a MinGW with working replacement *printf
functions. Just like for mingw32, require (and allow building with) a
recent enough version of mingwce.

Since MinGW is patched by CeGCC, this check is not strictly sufficient;
but at least this allows to have working WinCE builds again.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

the XvMC plugin use xcommon.c where some part use
HAVE_XINERAMA conditions.

Missing symbols are :
XineramaQueryScreens
XineramaQueryExtension
XineramaIsActive
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Stupid Ubunty Jaunty!

This reverts commit b6b78047.

Oups.

(cherry picked from commit 7ba508f8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Geoffroy Couprie <geo.couprie@gmail.com>
(cherry picked from commit d93246d2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Laurent Aimar <fenrir@videolan.org>

 Added capability to avformat and mkv demuxers to extract the
original_frame_width, original_frame_height and palette from their tracks
private data.
 Vobsubs in mkv were only using default values for these items.
Signed-off-by: Laurent Aimar <fenrir@videolan.org>

(u)int16 -> (u)int16_t
(u)int32 -> (u)int32_t
(cherry picked from commit 53ec8a45)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 190ae57d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit ecfdb8c3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>