dc8b73c069
applehttp: Change the variable for stream position in seconds into int64_t
...
A similar variable for the total stream duration was changed to
int64_t in b79c3df088lu_zero@gentoo.org >
2011-03-21 20:16:53 +01:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-03-19 13:33:20 +00:00
0fecf2642b
Merge remote-tracking branch 'newdev/master'
...
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-03-17 17:22:52 +01:00
f1f60f5252
lavf: Make make_absolute_url a lavf internal function
...
This is shared by both applehttp demuxer and protocol.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2011-03-17 12:28:37 +01:00
bc040cb3e2
applehttp: Fix a typo in a comment
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-03-17 11:20:21 +00:00
6947b0c42e
Merge remote-tracking branch 'newdev/master'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-03-15 16:48:42 +01:00
c76374c6db
Use AVERROR_EXIT with url_interrupt_cb.
...
Functions interrupted by url_interrupt_cb should not be restarted.
Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish
when the underlying system call was interrupted and actually needed to be
restarted.
This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed
content).
Signed-off-by: Nicolas George <nicolas.george@normalesup.org >
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-15 08:09:19 -04:00
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-07 17:20:31 -05:00
ebb92e0768
avio: rename url_fopen/fclose -> avio_open/close.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 22a3212e32
2011-02-23 18:22:03 +01:00
22a3212e32
avio: rename url_fopen/fclose -> avio_open/close.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-23 10:18:55 -05:00
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit ae628ec1fd
2011-02-20 19:05:47 +01:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-20 08:37:15 -05:00
105ba7dc28
applehttp: Handle absolute paths relative to the current server
...
This fixes roundup issue 2583.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 185a155e57
2011-02-06 20:31:45 +01:00
185a155e57
applehttp: Handle absolute paths relative to the current server
...
This fixes roundup issue 2583.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-04 12:23:04 -05:00
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
2011-01-28 03:15:34 +01:00
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
1a172ce6b1
applehttp: Fix the key check in handle_variant_args
...
The key string is supposed to contain the equals character,
too. Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.
Signed-off-by: Mans Rullgard <mans@mansr.com >
(cherry picked from commit 2b0decf60b
2011-01-26 03:43:28 +01:00
2b0decf60b
applehttp: Fix the key check in handle_variant_args
...
The key string is supposed to contain the equals character,
too. Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-01-24 20:19:37 +00:00
b79c3df088
prevent integer overflow in calculating duration
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2011-01-17 17:05:58 +02:00
ae8c28db87
applehttp: Add comments to make_absolute_url
...
Originally committed as revision 25319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 21:59:16 +00:00
9d229ef9e6
applehttp: Handle a .. path segment in the base url
...
Originally committed as revision 25318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 21:58:36 +00:00
978a5ce82e
Reindent
...
Originally committed as revision 25317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 21:58:13 +00:00
8f7c2452de
applehttp: Allow the base url to be a local file name, too
...
Originally committed as revision 25316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 21:57:58 +00:00
b2125520e7
applehttp: define _XOPEN_SOURCE=600 as required for usleep()
...
Originally committed as revision 24839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 17:07:12 +00:00
cd223e0b4e
Add Apple HTTP Live Streaming demuxer
...
Originally committed as revision 24834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 14:54:37 +00:00
