Rafaël Carré
091552e8ad
Revert "logger: store in the context which logging mode is being used"
...
This reverts commit e50cfac2d3
.
This undid modifications made in f83d51d4b1
2012-01-25 04:00:00 -05:00
Rafaël Carré
e50cfac2d3
logger: store in the context which logging mode is being used
...
Don't close a NULL FILE* on android
2012-01-25 01:47:07 -05:00
Rafaël Carré
2e86bc8f27
logger: cascade if/else for different modes
2012-01-25 01:38:32 -05:00
Rafaël Carré
7c6abb2045
logger: move Apple related define where it is used
2012-01-25 01:36:57 -05:00
Rafaël Carré
9acc769230
logger: remove unused defines
2012-01-25 01:36:57 -05:00
Rafaël Carré
3437e616ae
Revert "Android: hack to fix warnings in pthread.h when compiling in C++"
...
This reverts commit 1a1bba5a3d
.
Conflicts:
include/vlc_fixups.h
2012-01-25 00:14:26 -05:00
Rafaël Carré
56018495fb
android: configure will fill PKG_CONFIG_LIBDIR itself
...
don't make it point to a wrong location
2012-01-24 23:46:11 -05:00
Rafaël Carré
a2fe52949e
android: remove workaround for old ndk
...
Give the real host to configure
2012-01-24 23:44:51 -05:00
Rafaël Carré
2a8e01dda3
contrib: live555: don't match just 'ar'
...
It would replace the 'ar' of 'arm-....'
Instead use "LIBRARY_LINK =.*ar" to be sure we replace the correct tool
2012-01-24 22:43:07 -05:00
Rafaël Carré
c48f8460bb
contrib: ffmpeg was removed from libav
2012-01-24 19:09:27 -05:00
Martin Storsjö
3c34f80809
omxil: Add a prefix to the iomx function symbols
...
On some devices (apparently froyo and earlier), some OMX core
(with sw-only codecs) already is loaded into the process, and
dlsym(RTLD_DEFAULT) can just as well return functions from that
one instead of the ones from the iomx wrapper that we've loaded.
This makes sure we really get the functions we want.
Signed-off-by: Rafaël Carré <funman@videolan.org>
2012-01-24 18:25:54 -05:00
Rémi Denis-Courmont
f6587cd61c
Fix MacOS build
2012-01-24 21:05:39 +02:00
Felix Paul Kühne
d832507736
macosx: make sure the main window's position is correctly restored ( fixes #5856 )
2012-01-24 20:04:01 +01:00
Rémi Denis-Courmont
97fbfd8806
Compute the lib directory dynamically
...
On Linux, this simplifies the code and improves relocability.
On Windows, OS/2 and MacOS, this should fix a small race condition.
2012-01-24 21:02:14 +02:00
Olivier Gambier
2171af1784
contrib: live555: replace ar by our $(AR)
...
Signed-off-by: Rafaël Carré <funman@videolan.org>
2012-01-24 13:42:55 -05:00
Rafaël Carré
6e6bfaf4f5
Revert "android: don't use unexisting option"
...
This reverts commit 3bbc2f5463
.
Now it exists again
2012-01-24 13:37:35 -05:00
Hugo Beauzée-Luyssen
924a3408fd
hls: Don't crash if a segment can't be found.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:50 +01:00
Hugo Beauzée-Luyssen
c51ff47e32
hls: Removing useless assignments.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:50 +01:00
Hugo Beauzée-Luyssen
d56ce5536a
hls: Removing calls to vlc_array_item_at_index
...
Using hls_Get and segment_GetSegment instead. Those check for out of
bound access.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:50 +01:00
Hugo Beauzée-Luyssen
f180bd5f1a
hls: Removing warnings.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:50 +01:00
Hugo Beauzée-Luyssen
833b0c760d
hls: Cosmetics: removing useless casts.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:50 +01:00
Hugo Beauzée-Luyssen
75fbc4d4b7
hls: Fixing a deadlock introduced in previous commit.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:50 +01:00
Hugo Beauzée-Luyssen
e06362372e
hls: Fixing playlist updating.
...
parse_M3U8 uses hls_GetLast to update the HLS current hls stream, so we
have to add it to the streams array before calling parse_M3U8
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:49 +01:00
Hugo Beauzée-Luyssen
e618a58149
hls: Fixing hls_Copy
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:47 +01:00
Frédéric Yhuel
982071198e
HLS restore pos of current segment before seeking
...
This prevents a "bug" when we seek backward and then play again that
segment.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 18:54:31 +01:00
Brendon Justin
40c5ee7f1b
macosx: Make streaming wizard output string editable
...
Change the string's text field from static to editable, so options not in the
wizard can be added. Uses the string from this field directly, rather than the
stored string.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
2012-01-24 18:48:46 +01:00
Felix Paul Kühne
e0745f6002
qtcapture: timing and speed improvements
...
it respects the 'live-caching' setting now, is vastly more responsive and even got correct timing.
Thanks to emi and Luca for the ideas and help
2012-01-24 18:43:23 +01:00
Felix Paul Kühne
b289977901
macosx: prevent warnings on console when opening the audio effects panel
...
this were caused by an incomplete implementation of a 2.0-next feature
2012-01-24 18:43:23 +01:00
Felix Paul Kühne
af19708431
macosx: remove outdated code
2012-01-24 18:43:22 +01:00
Rémi Denis-Courmont
fd8502cee8
Replace --disable-libv4l2 with --disable-v4l2
...
This disables V4L2 completely.
2012-01-24 19:10:14 +02:00
Rémi Denis-Courmont
f94107eb9a
Revert "v4l2: check if kernel headers are recent enough"
...
This reverts commit 5740099f6f
.
This caused autoconf errors and besides I still do not agree.
2012-01-24 19:10:13 +02:00
Rémi Denis-Courmont
d0413f1d8b
Properly remove the old dvb plugin, fix bootstrapping
...
(I do not know why it was removed in the first place though - not me!
As a consequence, we cannot scan TV channels in VLC >= 2.0...)
2012-01-24 19:10:13 +02:00
Rémi Denis-Courmont
1f558cd6b1
Fix automake breakage in logger
2012-01-24 19:10:13 +02:00
Rémi Denis-Courmont
00a0d57271
hls: fix linking
2012-01-24 19:10:13 +02:00
Rémi Denis-Courmont
158cf2c5cd
Fix libvlccore linking order
2012-01-24 19:10:12 +02:00
Rafaël Carré
a9739cc0a5
contrib: live555: don't replace cc 2 times for macosx
...
we could end up with 'ggcc'
forgotten in a6e2d06608
2012-01-24 12:02:56 -05:00
Francois Cartegnie
88ecb49bee
Qt: fix MLModel
...
Was broken since the pure virtual method getId() was renamed in
the PLModel cleanup 4a61e6a8da
2012-01-24 17:02:37 +01:00
Francois Cartegnie
8eb8d9419b
Qt: don't show Ml button if it does nothing
2012-01-24 17:02:37 +01:00
Rémi Denis-Courmont
b0623ca085
Missing poll() declaration
2012-01-24 17:51:12 +02:00
Rafaël Carré
1e5ba4764f
contrib: speex: doesn't build in thumb
2012-01-24 01:08:38 -05:00
Rafaël Carré
40e6d6d1a5
Partly revert b192dc3c38
...
Those objects and shared library handle are not guaranteed to exist
if the Clean() function is called in Open() error path.
2012-01-23 21:14:50 -05:00
Denis Charmet
8e141adb83
MKV: Don't delete es at EOF in Demux() but in Close()
...
Fix the second part of #5896
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 01:40:18 +01:00
Denis Charmet
ccb134a643
MKV: Reset demux internal time when seeking to 0
...
Fix the first part of #5896
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-24 01:40:10 +01:00
Hugo Beauzée-Luyssen
1f33a25ef2
hls: Trying to work arround streams without bandwidth value.
...
A 0 bandwidth forbid us to seek, as the position would always be 0.
This fixes one of the problems described in #5370
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 21:37:33 +01:00
Hugo Beauzée-Luyssen
56a345ef6a
hls: Don't fail when a STREAM-INF is commented.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 21:36:34 +01:00
Luc Saillard
9ffcb9c5cf
hls: Fix vod
...
Don't stop when playing a vod file without bandwidth information
When a playlist doesn't contains any bandwidth stream or information,
initialize stream->bandwidth to 0 (it's a unsigned number). So test will
not
fail when calculating if we have the time to download it.
>> uint64_t size = (segment->duration * hls->bandwidth);
>> int estimated = (int)(size / s->p_sys->bandwidth);
>> if (estimated > segment->duration)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 21:34:49 +01:00
Luc Saillard
1a89d92f27
hls: Renaming Download to hls_DownloadSegmentData
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 21:34:44 +01:00
Hugo Beauzée-Luyssen
bcbad8c70e
hls: Fixing some locks.
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 21:34:28 +01:00
Luc Saillard
04f73b95ae
hls: Support encryption
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 21:29:43 +01:00
Edward Wang
b6471932b5
Add NDK compiler to PATH under Android
...
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2012-01-23 16:58:32 +01:00