Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-04-07Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-06mmst: get rid of deprecated AVERRORsAnton Khirnov
2011-04-05Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-04avio: make url_close() internal.Anton Khirnov
2011-04-04avio: make url_write() internal.Anton Khirnov
2011-04-04avio: make url_read_complete() internal.Anton Khirnov
2011-04-04avio: make url_open() internal.Anton Khirnov
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-20avio: move init_put_byte() to a new private header and rename itAnton Khirnov
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 e731b8d8729e75bfb69f5540e6446d6118dac549)
2011-02-20avio: rename ByteIOContext to AVIOContext.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
2011-02-20avio: move init_put_byte() to a new private header and rename itAnton Khirnov
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>
2011-02-20avio: rename ByteIOContext to AVIOContext.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-15mmst: fix reading uninitialized data for ping packets.Ronald S. Bultje
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 275189a2bd71cf49d66374c44d3de2262d323460)
2011-02-15mmst: print packet type with error status code messageFrancesco Cosoleto
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 70630e35a436d890f3e3fbbe73b70042a375f326)
2011-02-14mmst: fix reading uninitialized data for ping packets.Ronald S. Bultje
Fixes errors after a few minutes (first ping) when playing back mmst://wm.bbc.co.uk/wms/bbc7coyopa/bbc7_-_friday_0430.wma
2011-02-14mmst: print packet type with error status code messageFrancesco Cosoleto
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-01-30Replace dprintf with av_dlogLuca Barbato
dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
2011-01-30Replace dprintf with av_dlogLuca Barbato
dprintf clashes with POSIX.1-2008
2011-01-28Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò
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 c6610a216ed2948885772154a2eed696e0cb4aca)
2011-01-27Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò
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-23lavf: move ff_put_str16_nolen from asf to avio and rename itAnton Khirnov
It will be useful in the mp3 muxer. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit dccbd97d72991f4df63542e1ee03db2f8d7a0238)
2011-01-21lavf: move ff_put_str16_nolen from asf to avio and rename itAnton Khirnov
It will be useful in the mp3 muxer. Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-10-05Set proper error if server flags indicate that it doesn't support mmst. Thisqrtt1
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-08-13Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamicallyRonald S. Bultje
allocate the array. Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13Fix wrong command prefix for timing test in MMST protocol.Zhentan Feng
Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12Move functions and structs shared between MMSH and MMST into their own file,Zhentan Feng
mms.c. Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12Extract fields that are to be shared between MMST/MMSH into a common struct,Zhentan Feng
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-12Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet.Ronald S. Bultje
Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-05Move read_mms_packet() code to be inlined in the calling function.Zhentan Feng
Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-05Remove is_playing variable.Zhentan Feng
Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-05Move send_media_packet_request() and clear_stream_buffers() up.Zhentan Feng
Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27Reindent after r24516.Ronald S. Bultje
Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27Use inverse error branches, i.e. instead of if(something){success} else {error},Ronald S. Bultje
use if(!something) {return error;} success;, which needs less indenting. Originally committed as revision 24516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27Use av_log(.., AV_LOG_ERROR) instead of dprintf() for logging errors. ThisRonald S. Bultje
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-20Allow the ASF header to be transferred split over multiple packets, as someZhentan Feng
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-20Explicitely set the size of the "ff_asf_head1_guid" header chunk, this isZhentan Feng
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-20Align outgoing messages to 8 bytes, this is required to interact withZhentan Feng
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-20Fix a compile warning when compiling with DEBUG=1. The warning was:Zhentan Feng
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-20Check the status code of each server responses, and fail if it indicatesZhentan Feng
a problem. Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20Send a time test to the server, as the spec recommends.Zhentan Feng
Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27Make ff_url_split() publicMåns Rullgård
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-15Fix missing logging context in a series of dprintf()s. Partially based onZhentan Feng
patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 23614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>.Zhentan Feng
Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk