Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

This fixes quite a few .idx samples that didn't work before.
(cherry picked from commit a76a1d046ad221c6ac7132a064e25e5393d6ef98)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

As it works fine over http if mp4-files are done with mp4box -tight or similar way,
in most cases mp4-files aren't done like that and avformat works much better in those
cases (don't need to seek so much).
(cherry picked from commit 45f7ca3d6cff34b10f2cf314c15fca9066e8ccf8)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

This replace with a set of headers from the Wine project, modified by
Jean-Baptiste Kempf
(cherry picked from commit 3759bee802342c0204b1104fc1aa9832147c00c7)

Notably export GUID in the header

Taken from access/dshow/
(cherry picked from commit 2deaa69d1ab275538fe7746a10e469040ab743a9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

The comment seems to be irrelevant (the variable is called marq-color and not marq-col).
(cherry picked from commit 1b447443c9db0ec1d6b1952fd30cba8edc2b47df)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 2de4c9faad5c03b4b3d9a87b51ab14e24eb7e380)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 775f1d06cf8fd66507c0ddc3417bef7b5a4e6606)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Patch by Samuli Suominen.
See: https://bugs.gentoo.org/show_bug.cgi?id=353848Sent-by: Alexis Ballier <aballier@gentoo.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 638f95c3b0cffb237eb2a69fadb71c565c3dd014)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

This is evil!
(cherry picked from commit 6857923a03d769295dd98135ea6d35dbbaec925f)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

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

.. and updated xcodeproj

Currently, vlc puts the value *and* the description in the value field
for id3 TXXX tags, e.g. in Media Information:
REPLAYGAIN_TRACK_GAIN: REPLAYGAIN_TRACK_GAIN +3.30 dB

This leads to vlc_audio_replay_gain_MergeFromMeta() failing because it
can't parse the floating point value. Since the fieldList() of an
UserTextIdentificationFrame has exactly two members, it is safe to just
use the last (value) member. In Media Information:
REPLAYGAIN_TRACK_GAIN: +3.30 dB

This makes ReplayGain work for mp3 files.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 5010066b9771f6862e71b53f36e27816500e04f3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

We can't analyze them anyway, and they take space and bandwidth.
(cherry picked from commit f5b88cbb5bb716ef38b1754bd6f7be9f2b151c98)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

(cherry picked from commit 659bba5c453ae63ecb36bc8df3918eaa6113ae6c)

Conflicts:

	modules/gui/qt4/dialogs_provider.cpp

That's what the old interface did
(cherry picked from commit 553bc045d86a45559469e854a7855a0735fee951)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

See #4455. The lua interface merely polls, reads and writes on file
descriptors 0 and 1, and expects it to work. There is no support for
spawning a console and redirecting/getting file descriptors to it, and
file descriptors are mixed with socket descriptors and polled, which
won't work on windows. Until something is done about it, revert to the
old rc interface

If the playlist file says HTTP, we really should not try MMS over TCP
or MMS over UDP, but only MMS over HTTP.
(cherry picked from commit f0c3d6fb0b9c33b06753cf60c724ee1c3fd2dd40)

Backport from 174ded88c536ffc9f9eeb8de96e29cf5e9c9a889 in master

Idea taken from ebced314439f16e0d4dd8406ed0488f1677fa65f in master

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

When the subtitle is auto-detected, fail, complain, but do not block the
playback with annoying pop-up. This should fix the .txt subtitle issue.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

No behaviour change.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 0ff1ed4ee47869518c00dab4128af8f274a1599a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

based on vlc.git 7be936ca451fa0c052069895460dcc0e67f4dfa3
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>