summaryrefslogtreecommitdiff
path: root/libavformat/mmst.c
Commit message (Collapse)AuthorAge
* Add some forgotten const to function arguments in libavfilter & libavformat.Michael Niedermayer2011-05-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | 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.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use designated initializers for all protocolsAnton Khirnov2011-04-08
| | | | | | | | | | This is more readable and makes it easier to reorder URLProtocol members.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mmst: get rid of deprecated AVERRORsAnton Khirnov2011-04-06
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avio: make url_close() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_write() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_read_complete() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_open() internal.Anton Khirnov2011-04-04
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | 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>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * mmst: fix reading uninitialized data for ping packets.Ronald S. Bultje2011-02-14
| | | | | | | | | | Fixes errors after a few minutes (first ping) when playing back mmst://wm.bbc.co.uk/wms/bbc7coyopa/bbc7_-_friday_0430.wma
| * mmst: print packet type with error status code messageFrancesco Cosoleto2011-02-13
| | | | | | | | | | Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | 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.
| * lavf: move ff_put_str16_nolen from asf to avio and rename itAnton Khirnov2011-01-21
| | | | | | | | | | | | It will be useful in the mp3 muxer. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | | | 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)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | mmst: fix reading uninitialized data for ping packets.Ronald S. Bultje2011-02-14
| | | | | | | | | | | | 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)
* | mmst: print packet type with error status code messageFrancesco Cosoleto2011-02-14
| | | | | | | | | | | | Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 70630e35a436d890f3e3fbbe73b70042a375f326)
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-28
| | | | | | | | | | | | 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)
* | lavf: move ff_put_str16_nolen from asf to avio and rename itAnton Khirnov2011-01-23
|/ | | | | | | It will be useful in the mp3 muxer. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit dccbd97d72991f4df63542e1ee03db2f8d7a0238)
* Set proper error if server flags indicate that it doesn't support mmst. Thisqrtt12010-10-05
| | | | | | | | 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
* Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamicallyRonald S. Bultje2010-08-13
| | | | | | allocate the array. Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix wrong command prefix for timing test in MMST protocol.Zhentan Feng2010-08-13
| | | | | | Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move functions and structs shared between MMSH and MMST into their own file,Zhentan Feng2010-08-11
| | | | | | mms.c. Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Extract fields that are to be shared between MMST/MMSH into a common struct,Zhentan Feng2010-08-11
| | | | | | | | 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
* Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet.Ronald S. Bultje2010-08-11
| | | | Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move read_mms_packet() code to be inlined in the calling function.Zhentan Feng2010-08-04
| | | | | | Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24700 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove is_playing variable.Zhentan Feng2010-08-04
| | | | | | Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move send_media_packet_request() and clear_stream_buffers() up.Zhentan Feng2010-08-04
| | | | | | Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24698 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after r24516.Ronald S. Bultje2010-07-26
| | | | Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use inverse error branches, i.e. instead of if(something){success} else {error},Ronald S. Bultje2010-07-26
| | | | | | use if(!something) {return error;} success;, which needs less indenting. Originally committed as revision 24516 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use av_log(.., AV_LOG_ERROR) instead of dprintf() for logging errors. ThisRonald S. Bultje2010-07-26
| | | | | | | 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
* Allow the ASF header to be transferred split over multiple packets, as someZhentan Feng2010-07-20
| | | | | | | | | 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
* Explicitely set the size of the "ff_asf_head1_guid" header chunk, this isZhentan Feng2010-07-20
| | | | | | | | 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
* Align outgoing messages to 8 bytes, this is required to interact withZhentan Feng2010-07-20
| | | | | | | | | 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
* Fix a compile warning when compiling with DEBUG=1. The warning was:Zhentan Feng2010-07-20
| | | | | | | | 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
* Check the status code of each server responses, and fail if it indicatesZhentan Feng2010-07-20
| | | | | | | | a problem. Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24358 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Send a time test to the server, as the spec recommends.Zhentan Feng2010-07-20
| | | | | | Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 24357 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_url_split() publicMåns Rullgård2010-06-27
| | | | | | | 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
* Fix missing logging context in a series of dprintf()s. Partially based onZhentan Feng2010-06-15
| | | | | | patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 23614 to svn://svn.ffmpeg.org/ffmpeg/trunk
* MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>.Zhentan Feng2010-05-24
Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 13:02:14 +0000