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-11-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02Remove some stray unnecessary ffmpeg references.Diego Biurrun
2011-10-08return error code if error happensMaksym Veremeyenko
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04Fix standalone compilation of pipe protocol.Diego Biurrun
file_check() is not only used by the file protocol, adjust #ifdef accordingly.
2011-04-20Merge remote branch 'qatar/master'Michael Niedermayer
* 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>
2011-04-19avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini
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.
2011-04-14Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (32 commits) libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate libvo-*: Fix up the long codec names libavcodec: Mark AVCodec->priv_class const swscale: Factorize FAST_BGR2YV12 definition. libvo-aacenc: Only produce extradata if the global header flag is set lavf: postpone removal of public metadata conversion API lavc: postpone removal of request_channels lavc: postpone removal of audioconvert and sample_fmt wrappers lavf: postpone removal of deprecated avio functions libopencore-amr: Cosmetics: Rewrap and align libopencore-amr, libvo-amrbwenc: Rename variables and functions libopencore-amr: Convert commented out debug logging into av_dlog libopencore-amr: Remove an unused state variable libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table libopencore-amr: Remove a useless local variable libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const libopencore-amr, libvo-amrwbenc: Return proper error codes in most places libopencore-amr: Don't print carriage returns in log messages ... Conflicts: doc/developer.texi libavcodec/avcodec.h libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-13file: implement url_check() callback in the file and pipe protocolsStefano Sabatini
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-09Merge remote branch 'qatar/master'Michael Niedermayer
* 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>
2011-04-08avio: make URLContext internal.Anton Khirnov
2011-04-08lavf: use designated initializers for all protocolsAnton Khirnov
This is more readable and makes it easier to reorder URLProtocol members.
2011-04-08Merge remote branch 'qatar/master'Michael Niedermayer
* 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>
2011-04-07avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
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.
2010-07-06Add #ifdefs around code specific to file and pipe protocolsMåns Rullgård
Originally committed as revision 24076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06file_protocol: remove redundant #include sys/time.hMåns Rullgård
Originally committed as revision 24070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-01Declare the url_write buffer parameter as constMartin Storsjö
Originally committed as revision 23401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27Make file_open() return the error code set in errno if open() fails,Stefano Sabatini
rather than always ENOENT. Originally committed as revision 22972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04Implement support to the AVSEEK_SIZE operation in file_seek().Stefano Sabatini
Avoid the need to use seeking for getting the file size, use fstat instead, which is significantly faster. See thread: Subject: [FFmpeg-devel] [PATCH] Add support to AVSEEK_SIZE to the file protocol seek callback Date: Fri, 2 Apr 2010 13:13:27 +0200 Originally committed as revision 22799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13Do not call lseek() with invalid whence valueMåns Rullgård
Originally committed as revision 21795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27Only consider -1 as an error return value for open().Martin Storsjö
This is: - what Posix says (-1 on error, >=0 on success) - fixing a bug on winCE (<0 sometimes) Patch by Martin Storsjö: martin martin st Originally committed as revision 19513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-26Use intptr_t when casting pointers to int.Ramiro Polla
Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03Add url_get_file_handle(), which is used to get the file descriptorRonald S. Bultje
associated with the I/O handle (e.g. the fd returned by open()). See "[RFC] rtsp.c EOF support" thread. There were previously some URI-specific implementations of the same idea, e.g. rtp_get_file_handles() and udp_get_file_handle(). All of these are deprecated by this patch and will be removed at the next major API bump. Originally committed as revision 17779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03Remove size_t cast in setting s->priv_data directly to the (integer) fileRonald S. Bultje
descriptor returned by open(). This removes some dubious doublecasts such as priv_data = (void *) (size_t) some_integer, and is always safe on systems we care about because sizeof(int)<=sizeof(void*). See comments from Mans and Michael in "[RFC] rtsp.c EOF support" thread. Originally committed as revision 17768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs
They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-12Use setmode() if it exists in <io.h>, and not based on O_BINARY.Ramiro Polla
Originally committed as revision 16553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03Remove offset_t typedef and use int64_t directly instead.Diego Biurrun
The name offset_t is easily confused with the standard off_t type and *_t is POSIX reserved namespace if any POSIX header is included. Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27remove const qualifier, removes warning:Baptiste Coudurier
libavformat/file.c:99: warning: passing argument 2 of 'strtol' from incompatible pointer type Originally committed as revision 13454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09Use full path for #includes from another directory.Diego Biurrun
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-22os_support.h is also needed for usleep and lseek on MinGW.Ramiro Polla
Originally committed as revision 11075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-16Remove empty pipe_closeAlex Beregszaszi
Originally committed as revision 11045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-17Allow pipe: URL to take fd number as inputVincent Fourmond
Patch by Vincent Fourmond [vincent dot fourmond at 9online dot fr] Originally committed as revision 10134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-17Indent for next commitVincent Fourmond
Patch by Vincent Fourmond [vincent dot fourmond at 9online dot fr] Originally committed as revision 10133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-1010l: removed pipe_close instead of pipe_readRamiro Polla
Originally committed as revision 10047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-10Make the pipe URLProtocol share read and write functions with the file ↵Ramiro Polla
URLProtocol Originally committed as revision 10041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-26Check for O_BINARY instead of a list of systems that need itRamiro Polla
Originally committed as revision 9427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-24replace the uses of old string functions that Reimar missedMåns Rullgård
Originally committed as revision 9406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13This fixes error handling for BeOS, removing the need for some ifdefs.François Revol
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h. Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed. Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code. This also removes the need for berrno.h. Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21Remove useless #include.Diego Biurrun
Originally committed as revision 7339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21Remove useless MinGW #ifdefs.Ramiro Polla
patch by Ramiro Polla, ramiro lisha.ufsc br Originally committed as revision 7338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun
and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use justDiego Biurrun
CONFIG_MINGW or __MINGW32__ instead. Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-13Update licensing information: The FSF changed postal address.Diego Biurrun
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17COSMETICS: Remove all trailing whitespace.Diego Biurrun
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-06fixing pipe seek bugMichael Niedermayer
Originally committed as revision 3730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-24nut files in cygwin patch by ("Sascha Sommer" <saschasommer at freenet dot de>)Sascha Sommer
Originally committed as revision 3054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-25warning patrolFalk Hüffner
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk