virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
27,549 Commits 37 Branches 400 Tags 465 MiB
4a3556542d
Commit Graph

24 Commits

Author SHA1 Message Date
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
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)
 2011-01-28 03:15:34 +01:00
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)
 2011-01-23 19:32:06 +01:00
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
 2010-10-05 14:04:46 +00:00
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
 2010-08-13 17:30:01 +00:00
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
 2010-08-13 17:02:37 +00:00
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
 2010-08-11 22:50:17 +00:00
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
 2010-08-11 22:43:54 +00:00
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
 2010-08-11 22:27:29 +00:00
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
 2010-08-04 22:34:43 +00:00
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
 2010-08-04 22:33:38 +00:00
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
 2010-08-04 22:32:43 +00:00
Ronald S. Bultje
db9cc3a55a Reindent after r24516. 
Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 22:22:42 +00:00
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
 2010-07-26 22:22:20 +00:00
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
 2010-07-26 22:21:14 +00:00
Zhentan Feng
e4a28be67b Allow the ASF header to be transferred split over multiple packets, as some 
servers happen to do. For this, we also move several header-size-related
variables to the MMSTContext.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:14:15 +00:00
Zhentan Feng
d6cc1123e3 Explicitely set the size of the "ff_asf_head1_guid" header chunk, this is 
part of the spec and causes problems otherwise.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:11:44 +00:00
Zhentan Feng
cbbb10810c Align outgoing messages to 8 bytes, this is required to interact with 
most servers. Also remove a case where we manually aligned to 8 bytes,
since this is now no longer needed.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:07:31 +00:00
Zhentan Feng
0c717a30e0 Fix a compile warning when compiling with DEBUG=1. The warning was: 
format ‘%d’ expects type ‘int’, but argument 3 has type ‘uint64_t’

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:05:45 +00:00
Zhentan Feng
9078eba062 Check the status code of each server responses, and fail if it indicates 
a problem.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:01:06 +00:00
Zhentan Feng
414df121e0 Send a time test to the server, as the spec recommends. 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 14:59:23 +00:00
Måns Rullgård
f3bfe388b5 Make ff_url_split() public 
ff_url_split() is retained as an alias, as it was used by ffserver,
to avoid breaking ABI compatibility with it.

Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-27 14:16:46 +00:00
Zhentan Feng
56023951be Fix missing logging context in a series of dprintf()s. Partially based on 
patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 23614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-15 14:24:19 +00:00
Zhentan Feng
a24039861d MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>. 
Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 21:59:32 +00:00