aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* avutil: fix project name reference in doxy sectionMichael Niedermayer2012-06-291-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* pixdesc: fix project reference in commentMichael Niedermayer2012-06-291-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* parseutils: fix sorting of colorsPaul B Mahol2012-06-281-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-281-0/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mss1: validate number of changeable palette entries mss1: report palette changed when some additional colours were decoded x86: fft: replace call to memcpy by a loop udp: Support IGMPv3 source specific multicast and source blocking dxva2: include dxva.h if found libm: Provide fallback definitions for isnan() and isinf() tcp: Pass NULL as hostname to getaddrinfo if the string is empty tcp: Set AI_PASSIVE when the socket will be used for listening Conflicts: configure libavcodec/mss1.c libavformat/udp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libm: Provide fallback definitions for isnan() and isinf()Martin Storsjö2012-06-271-0/+21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | log: change color for filters from blue to bright greenMichael Niedermayer2012-06-281-2/+2
| | | | | | | | | | | | | | The blue is difficult to read on several peoples terminals with black background. Idea-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-271-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: add an assert to silence an uninitialized variable warning. avconv: shut up an uninitialized variable warning. avfiltergraph: shut up uninitialized variable warning. af_join: initialize a variable to shut up gcc warning. amix: fix format specifier for AVFilterLink.sample_rate. lavfi: make filters less verbose. mpc8: read APE tags. lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes libm: provide fallback definition for cbrtf() using powf() network: Don't redefine error codes if they already exist in errno.h configure: Check for sys/time.h network: Include unistd.h from network.h avconv: don't include vsrc_buffer.h, which doesn't exist anymore lavfi: reorder AVFilterLink fields. lavfi: reorder AVFilterContext fields. lavfi: reorder AVFilter fields. lavfi: reorder AVFilterBufferRef fields. lavfi: reorder AVFilterBuffer fields. Conflicts: configure libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_crop.c libavfilter/vf_drawbox.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vsrc_color.c libavformat/network.h libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libm: provide fallback definition for cbrtf() using powf()Mans Rullgard2012-06-261-0/+7
| | | | | | | | | | | | | | | | This adds a fallback for cbrtf() using powf(x, 1/3). Since powf() with a non-integer exponent requires a non-negative base, special handling of negative inputs is needed. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavu/imgutils: create misc functions for dealing with buffersStefano Sabatini2012-06-263-1/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | Move the lavc/imgconvert functions and rename them as follows: avpicture_get_size -> av_image_get_buffer_size() avpicture_fill -> av_image_fill_arrays() avpicture_layout -> av_image_copy_to_buffer() The new functions have an align parameter, which allows to define the linesize alignment assumed in the buffer (which is set or read). The names of the functions are consistent with the lavu/samples API (av_samples_get_buffer_size(), av_samples_fill_arrays()).
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-262-34/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Include io.h on windows lavr: x86: merge some branches x86: cpu: whitespace (mostly) cosmetics x86: fft: win64: fix stack alignment for memcpy() call Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Include io.h on windowsRonald S. Bultje2012-06-251-0/+1
| | | | | | | | | | | | | | This is required for isatty, which exists on MSVC and is found by configure, but is provided by io.h instead of unistd.h. Signed-off-by: Martin Storsjö <martin@martin.st>
| * x86: cpu: whitespace (mostly) cosmeticsMans Rullgard2012-06-251-34/+36
| | | | | | | | | | | | | | | | | | This adds whitespace around operators, aligns line continuation backslashes, and breaks long lines. Also fixes an ifdef halfway through a statement. The one line of duplication this saved is not worth the ugliness. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | x86/intmath.h: Fix mull operand constraintsyang2012-06-261-1/+1
| | | | | | | | | | | | Fixes Ticket1466 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-253-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wtv: Check the return value from gmtime x86: fft: convert sse inline asm to yasm x86: place some inline asm under #if HAVE_INLINE_ASM Conflicts: libavcodec/x86/fft_sse.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: place some inline asm under #if HAVE_INLINE_ASMRonald S. Bultje2012-06-253-1/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Only include unistd.h if configure found it ape: create audio stream before reading tags. mov: make a length variable larger. image2: Add "start_number" private option to the demuxer image2: Add "start_number" private option to the muxer avconv: remove a forgotten debugging printf. avconv: use more descriptive names for hardcoded filters. avconv: remove redundant handling of async. doc/filters: fix typo. h264: use asm cabac reader under a generic condition Conflicts: ffmpeg.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Only include unistd.h if configure found itMartin Storsjö2012-06-241-1/+1
| | | | | | | | | | | | | | MSVC has isatty (in io.h), but not unistd.h. (isatty isn't called at all for windows, since there's a special case block for that.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | cpu.h: include version.h for LIBAVUTIL_VERSION_MAJORMichael Niedermayer2012-06-241-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: split version info into version.hMichael Niedermayer2012-06-243-23/+53
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-243-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: Only use optimizations with cmov if the CPU supports the instruction x86: Add CPU flag for the i686 cmov instruction x86: remove unused inline asm macros from dsputil_mmx.h x86: move some inline asm macros to the only places they are used lavfi: Add the af_channelmap audio channel mapping filter. lavfi: add join audio filter. lavfi: allow audio filters to request a given number of samples. lavfi: support automatically inserting the fifo filter when needed. lavfi/audio: eliminate ff_default_filter_samples(). Conflicts: Changelog libavcodec/x86/h264dsp_mmx.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/version.h libavutil/x86/cpu.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Add CPU flag for the i686 cmov instructionDiego Biurrun2012-06-233-1/+7
| |
* | qsort: flip compare direction to match libc qsort()Michael Niedermayer2012-06-221-9/+9
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-227-4/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add av_usleep() functionMans Rullgard2012-06-223-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function implements a delay using the first available of the following functions: - nanosleep() - usleep() - Sleep() (Windows) The conditional #includes in time.c are simplified by including unistd.h and windows.h whenever they are available rather than having these lines triggered by specific functions. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cosmetics: do not use full path for local headersDiego Biurrun2012-06-222-2/+2
| |
| * lavu/file: include unistd.h only when availableMans Rullgard2012-06-211-0/+2
| | | | | | | | | | | | | | | | The unistd.h header is only needed for the close() declaration. If this header is not available, the close() declaration may be provided by another header, e.g. io.h. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * log: include unistd.h only when neededMans Rullgard2012-06-211-0/+4
| | | | | | | | | | | | | | | | | | The only symbol this file uses from unistd.h is isatty(). By including the header only when this function is used, the file can be built on systems without unistd.h (which presumably also lack isatty). Signed-off-by: Mans Rullgard <mans@mansr.com>
* | extend log line buffer sizesWolfram Gloger2012-06-221-5/+7
| | | | | | | | | | | | | | | | | | The string passed to av_vlog() from libx264's X264_log overflows the 512 byte part_size, truncating x264 parameter output. Double this size and put it in a #define so it only needs to be changed in one place. Signed-off-by: Wolfram Gloger <video06@malloc.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "mathematics.h: remove a couple of math defines"Carl Eugen Hoyos2012-06-221-0/+18
| | | | | | | | | | | | | | | | This reverts commit a2b186a188c126dd0402414d9e8198ec4df63ebe. The defines were present for several years, removing them without a version bump may break API. (Fixes MPlayer compilation.)
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fix hardcoded tables compililation caused by missing math constants lavf: Make codec_tag arrays constant twinvq: give massive struct a name. lavf, lavu: version bumps and APIchanges for av_gettime() move lavfi/audio: don't set cur_buf in ff_filter_samples(). lavfi/fifo: add audio version of the fifo filter. fifo: fix parenthesis placement. lavfi: rename vf_fifo.c -> fifo.c lavc: remove stats_in from AVCodecContext options table. Conflicts: doc/APIchanges libavfilter/Makefile libavfilter/allfilters.c libavfilter/audio.c libavfilter/fifo.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf, lavu: version bumps and APIchanges for av_gettime() moveMans Rullgard2012-06-211-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | libavutil: fix author attributionMichael Niedermayer2012-06-202-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libav.org has removed this while moving the code around For reference, the code was originally added in: commit 9aeeeb63f7e1ab7b0b7bb839a5f258667a2d2d78 Author: Fabrice Bellard <fabrice@bellard.org> Date: Wed Dec 20 00:02:47 2000 +0000 Initial revision Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk -- The function name originates from: commit 949885313226f01ae7ba9a69eff5c45b47b78d57 Author: Fabrice Bellard <fabrice@bellard.org> Date: Thu Jul 25 16:01:46 2002 +0000 more consistent naming Originally committed as revision 802 to svn://svn.ffmpeg.org/ffmpeg/trunk Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-206-23/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * av_gettime: support Win32 without gettimeofday()Mans Rullgard2012-06-201-0/+16
| | | | | | | | | | | | Based on patch by Ronald S. Bultje. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Use av_gettime() in various placesMans Rullgard2012-06-201-4/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move av_gettime() to libavutilMans Rullgard2012-06-203-0/+61
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mathematics.h: remove a couple of math definesJanne Grunau2012-06-201-18/+0
| | | | | | | | | | | | | | | | While these defines are not defined by the C standard they are standardized as X/Open System Interfaces Extension. We use the appropiate _XOPEN_SOURCE define to make them available. They seem to be available on all FATE configs since the constants are used in files where mathematics.h is not included.
| * Remove unnecessary inclusions of [sys/]time.hMans Rullgard2012-06-201-1/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | log: flip highlight bit for codec & muxer layerMichael Niedermayer2012-06-201-12/+12
| | | | | | | | | | | | This way the encoder/muxer side is bold Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-197-0/+137
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) flvdec: remove incomplete, disabled seeking code mem: add support for _aligned_malloc() as found on Windows lavc: Extend the documentation for avcodec_init_packet flvdec: remove incomplete, disabled seeking code http: replace atoll() with strtoll() mpegts: remove unused/incomplete/broken seeking code af_amix: allow float planar sample format as input af_amix: use AVFloatDSPContext.vector_fmac_scalar() float_dsp: add x86-optimized functions for vector_fmac_scalar() float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil lavr: Add x86-optimized function for flt to s32 conversion lavr: Add x86-optimized function for flt to s16 conversion lavr: Add x86-optimized functions for s32 to flt conversion lavr: Add x86-optimized functions for s32 to s16 conversion lavr: Add x86-optimized functions for s16 to flt conversion lavr: Add x86-optimized function for s16 to s32 conversion rtpenc: Support packetizing iLBC rtpdec: Add a depacketizer for iLBC Implement the iLBC storage file format mov: Support muxing/demuxing iLBC ... Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/dsputil.c libavcodec/version.h libavformat/movenc.c libavformat/mpegts.c libavformat/version.h libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: add support for _aligned_malloc() as found on WindowsRonald S. Bultje2012-06-191-0/+6
| | | | | | | | | | | | | | | | The check uses check_func_header, since this function is conditionally available depending on the targeted MSVCRT version. Signed-off-by: Martin Storsjö <martin@martin.st>
| * float_dsp: add x86-optimized functions for vector_fmac_scalar()Justin Ruggles2012-06-183-3/+57
| |
| * float_dsp: Move vector_fmac_scalar() from libavcodec to libavutilJustin Ruggles2012-06-184-0/+77
| |
* | avutil: add get_category() for the case where one AVClass can have more than ↵Michael Niedermayer2012-06-193-5/+22
| | | | | | | | | | | | 1 category Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | log: swap colors for muxer and codec layerMichael Niedermayer2012-06-191-12/+12
| | | | | | | | | | | | | | This way the filters which are semantically closer to the codec layer have a (subjectively to me) more similar color. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/intmath: fix type of FASTDIVMichael Niedermayer2012-06-191-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-181-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs Add Dolby/DPLII downmix support to libavresample vorbisdec: replace div/mod in loop with a counter fate: vorbis: add 5.1 surround test rtpenc: Allow requesting H264 RTP packetization mode 0 configure: Sort the library listings in the help text alphabetically dwt: remove variable-length arrays RTMPT protocol support http: Properly handle chunked transfer-encoding for replies to post data http: Fail reading if the connection has gone away amr: Mark an array const amr: More space cleanup rtpenc: Fix memory leaks in the muxer open function Conflicts: Changelog configure doc/APIchanges libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add Dolby/DPLII downmix support to libavresampleJohn Stebbins2012-06-181-0/+7
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | libavutil: add a merge sort.Michael Niedermayer2012-06-181-0/+25
| | | | | | | | | | | | | | compared to qsort this is slower but its stable and doesnt have a O(n^2) worst case Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qsort doxyMichael Niedermayer2012-06-181-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>