Diego Biurrun
daf8cf358a
avformat: Don't anonymously typedef structs
10 years ago
Michael Niedermayer
8db0c2ffe6
avformat/mmst: Use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
ced0d6c14d
Use correct msvc type specifiers for ptrdiff_t and size_t.
...
The Windows runtime aborts if it finds %t or %z.
Fixes ticket #3472 .
Reviewed-by: Ronald Bultje
11 years ago
Luca Barbato
1716b4c7b8
mms: Remove non-utf8 characters
...
Certain softwares get badly confused.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Michael Niedermayer
7561974dfe
avformat/mmst: propagate error code from avio_put_str16le()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Martin Storsjö
d872fb0f7f
lavf: Reset the entry count and allocation size variables on av_reallocp failures
...
When av_reallocp fails, the associated variables that keep track of
the number of elements in the array (and in some cases, the
separate number of allocated elements) need to be reset.
Not all of these might technically be needed, but it's better to
reset them if in doubt, to make sure variables don't end up
conflicting.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Alexandra Khirnova
5626f994f2
avformat: Use av_reallocp() where suitable
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Martin Storsjö
6aa4e88106
mmst: Use AVUNERROR() to convert error codes to the right range for strerror
...
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Martin Storsjö
32b83aeec1
avio: Add an URLProtocol flag for indicating that a protocol uses network
...
This definition is in two files, since the definitions will move
to the private header at the next bump.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Diego Biurrun
8fd35b1aac
Fix a bunch of typos.
13 years ago
Martin Storsjö
c3b05d2159
proto: Realign struct initializers
...
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Martin Storsjö
7e58050590
proto: Use .priv_data_size to allocate the private context
...
This simplifies the open functions by avoiding one function
call that needs error checking, reducing the amount of
extra bulk code.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Anton Khirnov
ddffc2fdc3
avio: add support for passing options to protocols.
...
Not used anywhere yet, support for passing options from avio_open() will
follow.
13 years ago
Martin Storsjö
6f1b7b3944
avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
...
Change all uses of these function to pass the relevant
callback on.
13 years ago
Michael Niedermayer
e6e7ba0ce3
Add some forgotten const to function arguments in libavfilter & libavformat.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Stefano Sabatini
59d96941f0
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
...
Make AVIO_FLAG_ access constants work as flags, and in particular fix
the behavior of functions (such as avio_check()) which expect them to
be flags rather than modes.
This breaks API.
14 years ago
Anton Khirnov
f35ff97f2e
lavf: use designated initializers for all protocols
...
This is more readable and makes it easier to reorder URLProtocol
members.
14 years ago
Anton Khirnov
f87b1b373a
avio: AVIO_ prefixes for URL_ open flags.
14 years ago
Anton Khirnov
6e37b45888
mmst: get rid of deprecated AVERRORs
14 years ago
Anton Khirnov
e52a9145c8
avio: make url_close() internal.
14 years ago
Anton Khirnov
925e908bc7
avio: make url_write() internal.
14 years ago
Anton Khirnov
dce3756459
avio: make url_read_complete() internal.
14 years ago
Anton Khirnov
0589da0aa5
avio: make url_open() internal.
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
ae99313aa5
avio: move init_put_byte() to a new private header and rename it
...
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e731b8d872
)
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
e731b8d872
avio: move init_put_byte() to a new private header and rename it
...
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Ronald S. Bultje
e84314515a
mmst: fix reading uninitialized data for ping packets.
...
Fixes errors after a few minutes (first ping) when playing back
mmst://wm.bbc.co.uk/wms/bbc7coyopa/bbc7_-_friday_0430.wma
(cherry picked from commit 275189a2bd
)
14 years ago
Francesco Cosoleto
2594d75fb2
mmst: print packet type with error status code message
...
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 70630e35a4
)
14 years ago
Ronald S. Bultje
275189a2bd
mmst: fix reading uninitialized data for ping packets.
...
Fixes errors after a few minutes (first ping) when playing back
mmst://wm.bbc.co.uk/wms/bbc7coyopa/bbc7_-_friday_0430.wma
14 years ago
Francesco Cosoleto
70630e35a4
mmst: print packet type with error status code message
...
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Luca Barbato
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
)
14 years ago
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
14 years ago
Diego Elio Pettenò
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
)
14 years ago
Diego Elio Pettenò
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.
14 years ago
Anton Khirnov
6e89b61293
lavf: move ff_put_str16_nolen from asf to avio and rename it
...
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dccbd97d72
)
14 years ago
Anton Khirnov
dccbd97d72
lavf: move ff_put_str16_nolen from asf to avio and rename it
...
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
qrtt1
42f9582d8d
Set proper error if server flags indicate that it doesn't support mmst. This
...
prevents a read-after-close-induced segfault later. Fixes issue 2266.
Patch by qrtt1 <chingyichan dot tw gmail com>.
Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Ronald S. Bultje
67197656d1
Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamically
...
allocate the array.
Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Zhentan Feng
99ab8ff049
Fix wrong command prefix for timing test in MMST protocol.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Zhentan Feng
fcd11c61ea
Move functions and structs shared between MMSH and MMST into their own file,
...
mms.c. Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Zhentan Feng
edce93536a
Extract fields that are to be shared between MMST/MMSH into a common struct,
...
MMSContext. The other MMST-specific members go into MMSTContext.
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24778 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Ronald S. Bultje
a46cd6e141
Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet.
...
Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Zhentan Feng
aaa91aa00e
Move read_mms_packet() code to be inlined in the calling function.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24700 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Zhentan Feng
05fc9a1bcf
Remove is_playing variable.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Zhentan Feng
b949875bf6
Move send_media_packet_request() and clear_stream_buffers() up.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24698 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Ronald S. Bultje
db9cc3a55a
Reindent after r24516.
...
Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Ronald S. Bultje
e87b7d72c6
Use inverse error branches, i.e. instead of if(something){success} else {error},
...
use if(!something) {return error;} success;, which needs less indenting.
Originally committed as revision 24516 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Ronald S. Bultje
540ab68c64
Use av_log(.., AV_LOG_ERROR) instead of dprintf() for logging errors. This
...
should help in making mmst a little more userfriendly, or at least debuggable.
Also use helpful error return values instead of -1.
Originally committed as revision 24515 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago