summaryrefslogtreecommitdiff
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-045-7/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: fix handling of custom mix matrices fate: force pix_fmt in lagarith-rgb32 test fate: add tests for lagarith lossless video codec. ARMv6: vp8: fix stack allocation with Apple's assembler ARM: vp56: allow inline asm to build with clang fft: 3dnow: fix register name typo in DECL_IMDCT macro x86: dct32: port to cpuflags x86: build: replace mmx2 by mmxext Revert "wmapro: prevent division by zero when sample rate is unspecified" wmapro: prevent division by zero when sample rate is unspecified lagarith: fix color plane inversion for YUY2 output. lagarith: pad RGB buffer by 1 byte. dsputil: make add_hfyu_left_prediction_sse4() support unaligned src. Conflicts: doc/APIchanges libavcodec/lagarith.c libavfilter/x86/gradfun.c libavutil/cpu.h libavutil/version.h libswscale/utils.c libswscale/version.h libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: build: replace mmx2 by mmxextDiego Biurrun2012-08-034-7/+12
| | | | | | | | | | | | | | Refactoring mmx2/mmxext YASM code with cpuflags will force renames. So switching to a consistent naming scheme beforehand is sensible. The name "mmxext" is more official and widespread and also the name of the CPU flag, as reported e.g. by the Linux kernel.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-031-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1dec: Remove separate scaling function for interlaced field MVs vc1dec: Invoke edge_emulation regardless of MV precision x86: Use consistent 3dnowext function and macro name suffixes g723_1: scale output as supposed for the case with postfilter disabled g723_1: increase excitation storage by 4 g723_1: fix upper bound parameter from inverse maximum autocorrelation g723_1: make scale_vector() behave like the reference g723_1: fix off-by-one error in normalize_bits() g723_1: save/restore excitation with offset to store LPC history wmapro: prevent division by zero when sample rate is unspecified x86: proresdsp: improve SIGNEXTEND macro comments x86: h264dsp: K&R formatting cosmetics LICENSE: Document all GPL files Conflicts: libavcodec/g723_1.c libavcodec/wmaprodec.c libavcodec/x86/h264dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Use consistent 3dnowext function and macro name suffixesDiego Biurrun2012-08-031-1/+1
| | | | | | | | | | | | Currently there is a wild mix of 3dn2/3dnow2/3dnowext. Switching to "3dnowext", which is a more common name of the CPU flag, as reported e.g. by the Linux kernel, unifies this.
* | timecode: show frame rate when invalid.Clément Bœsch2012-08-011-1/+2
| |
* | lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special valuesStefano Sabatini2012-07-311-0/+2
| | | | | | | | The documentation was erroneously removed in 7cf9aadd.
* | audioconvert: add av_get_standard_channel_layout().Nicolas George2012-07-303-1/+23
| | | | | | | | Also bump minor version and add APIchanges entry.
* | audioconvert: add av_get_channel_description().Nicolas George2012-07-302-0/+19
| |
* | audioconvert: include the description of channels in the library.Nicolas George2012-07-301-29/+34
| |
* | samplefmt: Fix warning about discarded qualifierjamal2012-07-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-291-92/+127
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: clip num_args to 7 on x86-32.Loren Merritt2012-07-281-0/+3
| | | | | | | | | | | | | | | | This allows us to unconditionally set the cglobal num_args parameter to a bigger value, thus making writing yasm code even easier than before. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * x86inc: sync to latest version from x264.Ronald S. Bultje2012-07-281-92/+124
| |
* | lavu/bprint: extend/clarify documentation for av_bprint_init() size_max valueStefano Sabatini2012-07-281-9/+12
| | | | | | | | | | Also define AV_BPRINT_SIZE_* macros before av_bprint_init() declaration, and mention them in the av_bprint_init() doxy.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-273-21/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: port x86 assembly to cpuflags. lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro lavfi: better channel layout negotiation alac: check for truncated packets alac: reverse lpc coeff order, simplify filter lavr: add x86-optimized mixing functions x86: add support for fmaddps fma4 instruction with abstraction to avx/sse tscc2: fix typo in array index build: use COMPILE template for HOSTOBJS build: do full flag handling for all compiler-type tools eval: fix printing of NaN in eval fate test. build: Rename aandct component to more descriptive aandcttables mpegaudio: bury inline asm under HAVE_INLINE_ASM. x86inc: automatically insert vzeroupper for YMM functions. rtmp: Check the buffer length of ping packets rtmp: Allow having more unknown data at the end of a chunk size packet without failing rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets Conflicts: Makefile configure libavcodec/x86/proresdsp.asm libavutil/eval.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: add support for fmaddps fma4 instruction with abstraction to avx/sseJustin Ruggles2012-07-271-5/+11
| |
| * eval: fix printing of NaN in eval fate test.Ronald S. Bultje2012-07-261-1/+4
| | | | | | | | | | This fixes "make fate-eval" on MSVC builds. Without this, the test outputs "-1.#NaN" instead of "nan" on MSVS 2010.
| * x86inc: automatically insert vzeroupper for YMM functions.Ronald S. Bultje2012-07-262-13/+12
| |
* | imgutils: Fix warnings about incompatible pointer type and discarded qualifiersjamal2012-07-271-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: support 50 and 60 frame rates in timecode apiMatthieu Bouron2012-07-273-4/+40
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-231-0/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: x86: add SHUFFLE_MASK_W macroJason Garrett-Glaser2012-07-221-0/+12
| | | | | | | | Simplifies pshufb masks that operate on words.
* | lavu: disable av_uninit for clangPaul B Mahol2012-07-161-1/+1
| | | | | | | | | | | | | | | | This silence bunch of useless warnings like: libavformat/mpeg.c:393:37: warning: variable 'dvdaudio_substream_type' is uninitialized when used within its own initialization [-Wuninitialized] Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-162-3/+36
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Check for CommandLineToArgvW vc1dec: Do not use random pred_flag if motion vector data is skipped vp8: Enclose pthread function calls in ifdefs snow: refactor code to work around a compiler bug in MSVC. vp8: Include the thread headers before using the pthread types configure: Check for getaddrinfo in ws2tcpip.h, too vp8: implement sliced threading vp8: move data from VP8Context->VP8Macroblock vp8: refactor decoding a single mb_row doc: update api changes with the right commit hashes mem: introduce av_malloc_array and av_mallocz_array Conflicts: configure doc/APIchanges libavcodec/vp8.c libavutil/mem.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: introduce av_malloc_array and av_mallocz_arrayLuca Barbato2012-07-142-3/+36
| | | | | | | | | | Both function ease allocating large arrays implementing the overflow check inside it.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-151-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: eval: add gt(), gte(), lt() and lte() fate tests eval: fix swapping of lt() and lte() imgconvert: deprecate avcodec_find_best_pix_fmt() imgconvert: add avcodec_find_best_pix_fmt2() imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt Conflicts: libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * eval: add gt(), gte(), lt() and lte() fate testsJanne Grunau2012-07-141-0/+8
| |
| * eval: fix swapping of lt() and lte()Max Lazarov2012-07-141-2/+2
| | | | | | | | CC: libav-stable@libav.org
* | av_samples_copy: support overlapping copiesMichael Niedermayer2012-07-121-2/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-111-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Check for the math function rint TechSmith Screen Codec 2 decoder rtsp: Add listen mode rtsp: Make rtsp_open_transport_ctx() non-static rtsp: Move rtsp_read_close rtsp: Parse the mode=receive/record parameter in transport lines Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Check for the math function rintRonald S. Bultje2012-07-111-0/+7
| | | | | | | | | | | | Add a fallback implementation if it doesn't exist. Signed-off-by: Martin Storsjö <martin@martin.st>
* | replace all __volatile__ by volatileMichael Niedermayer2012-07-111-1/+1
| | | | | | | | | | | | | | __volatile__ can cause problems with some compilers and volatile is a standard keyword. Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | parseutils: ignore digits below the microsecond.Nicolas George2012-07-101-0/+2
| | | | | | | | | | Accept 1.1234567 as simply 1.123456 instead of rejecting it. The rounding is towards 0, which is acceptable and much simpler.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-102-3/+45
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mss1: fix decoding masked regions in interframes mxfdec: fix off by one error. mxfdec: only parse next partition pack if parsing forward mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only mxfdec: fix frame height vs field height confusion mxfdec: Add intra_only flag to MXFTrack mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a mxfdec: truncate packets that extend past the next edit unit mxfdec: set pixel format for cdci picture formats mxfdec: detect uncomp pictures using essence container ul mxfdec: set track edit rate num/den in expected order x86/cpu: implement get/set_eflags using intrinsics x86/cpu: implement support for cpuid through intrinsics x86/cpu: implement support for xgetbv through intrinsics lavu: use intrinsics for emms on systems lacking inline asm support mem: Don't abort on av_malloc(0) in debug mode Conflicts: configure libavformat/mxf.h libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86/cpu: implement get/set_eflags using intrinsicsRonald S. Bultje2012-07-101-0/+14
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Martin Storsjö <martin@martin.st>
| * x86/cpu: implement support for cpuid through intrinsicsRonald S. Bultje2012-07-101-0/+14
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * x86/cpu: implement support for xgetbv through intrinsicsRonald S. Bultje2012-07-101-0/+11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavu: use intrinsics for emms on systems lacking inline asm supportRonald S. Bultje2012-07-101-2/+5
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Martin Storsjö <martin@martin.st>
| * mem: Don't abort on av_malloc(0) in debug modeMartin Storsjö2012-07-101-2/+0
| | | | | | | | | | | | This makes the behaviour consistent between debug and release mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | x86: cpu: clean up check for cpuid instruction supportMans Rullgard2012-07-101-20/+16
| | | | | | | | | | | | | | This adds macros for accessing the EFLAGS register and uses these instead of coding the entire check in inline asm. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-081-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cmutils: include shellapi.h on Win32 (for CommandLineToArgvW). x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME). id3v2: add a mimetype for bmp pictures. flacdec: be less strict when parsing attached pictures. flacdec: don't create an attached picture stream until we have all information. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).Ronald S. Bultje2012-07-071-0/+8
| |
* | x86inc: put basicnop under ifdef to prevent compile failure.Clément Bœsch2012-07-071-0/+2
| | | | | | | | | | | | This should fix the NASM box. Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
* | x86inc: try to put amdnop under ifdef to prevent compile failureMichael Niedermayer2012-07-071-0/+2
| | | | | | | | | | | | based on similar amdnop usage in ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | log: fix compilation failure on mingw due to reference to undefined set_color256Michael Niedermayer2012-07-071-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: 256 color supportPaul B Mahol2012-07-072-20/+30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cosmetics: various spelling fixesLou Logan2012-07-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Blowfish: restructure/simplify code a bit.Michael Niedermayer2012-07-061-26/+18
| | | | | | | | | | | | Very slightly faster (2% or so) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-054-18/+62
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qdm2: remove broken and disabled dump_context() debug function x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros x86inc: modify ALIGN to not generate long nops on i586 x86: h264_intrapred: port to cpuflag macros avplay: update input filter pointer when the filtergraph is reset. avconv: fix parsing of -force_key_frames option. h264: use templates to avoid excessive inlining xtea: Make the count parameter match the documentation blowfish: Make the count parameter match the documentation mpegvideo: Don't use ff_mspel_motion() for vc1 xtea: invert branch and loop precedence blowfish: invert branch and loop precedence flvdec: optionally trust the metadata avconv: Set audio filter time base to the sample rate vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpegvideo_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macrosLoren Merritt2012-07-051-4/+37
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
View Lorry Controller Status