Conflicts:

	extras/contrib/src/Makefile
(cherry picked from commit 8bba45f8)

Conflicts:

	extras/contrib/src/Makefile

This tries to preserve maemo-x86 compatibilty, if anyone cares.
However, this probably breaks N8x0 support if it ever worked(?).
(cherry picked from commit 3c6c622c)

(cherry picked from commit 7a33ca70)

(cherry picked from commit f06a9f62)

(cherry picked from commit 0e00a98a)

Conflicts:

	extras/contrib/src/Makefile

There is a configure option for this...
(cherry picked from commit 669c7bf2)

video_filter/canvas: various aspect-ratio related fixes

 - Remove silly defaulting to 4:3.  Instead, compute PAR based
   upon SAR of input video and canvas size.
 - Update documentation to remove ambiguity over what is meant
   by aspect-ratio
 - Fix subpicture calculations to
    (a) be much simpler,
    (b) correctly calculate width and height
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>
(cherry picked from commit c2752f81)

(cherry picked from commit 748d435f)

(cherry picked from commit 67036473)

Fix linking against N900 glibc 2.5.
(cherry picked from commit c1c8639c)

(cherry picked from commit 4a7cf6a7)

(cherry picked from commit cbac33a9)

(cherry picked from commit f3c14e26)

Backported from [f2287d10]

(cherry picked from commit 6595e351)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit bc96de5b)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit b7269a58)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 8587991a)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 8df85173)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit e95a7d37)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit c48d9cfc)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 81516c0e)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit c0dd0545)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 2c5e6a0e)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit af1f3a70)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit cf35b4e7)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 9fd3d36c)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit c9f75658)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 1431986e)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Too bad for your AAC encoding, but, well.
(cherry picked from commit 34ba8bd4)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit e2989313)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 923f3ec6)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Thanks a lot, French CSA for using it with almost noone able to decode it...
(cherry picked from commit 304dc455)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

And don't ignore errors
(cherry picked from commit 17a09405)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

You need a compiler.
(cherry picked from commit a8d24bd4)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Also use autoreconf where possible
And no need to reun automake after autoreconf
(cherry picked from commit 968754f8)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 05877904)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>