summaryrefslogtreecommitdiffstats
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'Michael Niedermayer2013-02-241-1/+4
|\ | | | | | | | | | | | | | | | | | | | | | | * commit 'f935aca44c674d30e3ed940ef73bbad1228a5855': av_memcpy_backptr: avoid an infinite loop for back = 0 4xm: check the return value of read_huffman_tables(). Conflicts: libavcodec/4xm.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * av_memcpy_backptr: avoid an infinite loop for back = 0Anton Khirnov2013-02-231-0/+3
| | | | | | | | CC:libav-stable@libav.org
* | lavu/parseutils: remove spurious "]]" in date format specificationStefano Sabatini2013-02-221-1/+1
| |
* | lavu/parseutils: allow MM:SS format for duration in av_parse_time()Senthilnathan M2013-02-223-2/+7
| | | | | | | | | | | | | | Fix trac ticket #2258. Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avutil/mem: do a small set of checks for memalign hack before freeing.Michael Niedermayer2013-02-221-2/+7
| | | | | | | | | | | | These can detect some kinds of memory and or pointer corruptions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: optimization for float aac decoder (sbr module)Mirjana Vulin2013-02-211-0/+40
| | | | | | | | | | Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-201-0/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: intreadwrite: tomi: Add missing attributes.h #include for av_always_inline Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * intreadwrite: tomi: Add missing attributes.h #include for av_always_inlineDiego Biurrun2013-02-201-0/+2
| |
| * x86: Use simple nop codes for <= sse (rather than <= mmx)Ronald S. Bultje2013-02-191-1/+1
| | | | | | | | | | | | | | | | The "CentaurHauls family 6 model 9 stepping 8" family of CPUs (flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse up rng rng_en ace ace_en) SIGILLs on long nop codes. Signed-off-by: Martin Storsjö <martin@martin.st>
* | fate: add print() to the tests of evalMichael Niedermayer2013-02-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eval: print() supportMichael Niedermayer2013-02-172-2/+12
| | | | | | | | | | | | This allows printing values via av_log from expressions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: Fix checkheaders for x86/emms.hJames Almer2013-02-171-0/+1
| | | | | | | | | | | | | | | | internal.h doesn't need to include cpu.h anymore since the relevant code was moved to x86/emms.h Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'Michael Niedermayer2013-02-152-21/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba': avutil: Ensure that emms_c is always defined, even on non-x86 configure: Move MinGW CPPFLAGS setting to libc section, where it belongs avutil: Move emms code to x86-specific header Conflicts: configure libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Ensure that emms_c is always defined, even on non-x86Diego Biurrun2013-02-142-3/+6
| |
| * avutil: Move emms code to x86-specific headerDiego Biurrun2013-02-142-20/+26
| |
* | lavu/intreadwrite: add AV_[RW][BLN]48Paul B Mahol2013-02-131-1/+67
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-121-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: lavu: avoid clashing definition of E doc: developer: Add a note about reserved system name space Conflicts: libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: avoid clashing definition of ELuca Barbato2013-02-121-4/+4
| | | | | | | | | | E is usually defined as a shorthand for AV_OPT_FLAG_ENCODING_PARAM. Rename the single expansion E(x) now used in libavutil to E1.
* | Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'Michael Niedermayer2013-02-122-214/+186
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62a43d30cc3b9b2460f2c926beb522df32493625': crc: Move static data table from header to .c file avcodec/rectangle: Remove nonsense assert Conflicts: libavcodec/rectangle.h libavutil/crc_data.h The assert is not removed as the assert ensures clear and easy to debug failures instead of undefined behavior in case of misalignment. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * crc: Move static data table from header to .c fileDiego Biurrun2013-02-112-214/+186
| | | | | | | | Having static data tables in header files is a potential source of trouble.
* | Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'Michael Niedermayer2013-02-121-1/+34
|\ \ | |/ | | | | | | | | | | | | * commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d': libfdk-aacenc: Actually check for upper bounds of cutoff arm: Fall back to runtime cpu feature detection via /proc/cpuinfo Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Fall back to runtime cpu feature detection via /proc/cpuinfoMartin Storsjö2013-02-111-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On recent android versions, /proc/self/auxw is unreadable (unless the process is running running under the shell uid or in debuggable mode, which makes it hard to notice). See http://b.android.com/43055 and https://android-review.googlesource.com/51271 for more information about the issue. This makes sure e.g. neon optimizations are enabled at runtime in android apps even when built in release mode, if configured to use the runtime detection. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Use simple nop codes for <= sse (rather than <= mmx).Ronald S. Bultje2013-02-111-1/+1
| | | | | | | | | | | | | | | | The "CPU: CentaurHauls family 6 model 9 stepping 8" family of CPUs (flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse up rng rng_en ace ace_en) SIGILLs on long nop codes. Change-Id: I7e7c52a2191006df30a9aadbc40d481a1db89106
* | Call the common 7.1 wide channel layout "7.1(wide)".Carl Eugen Hoyos2013-02-091-1/+2
| | | | | | | | Rename the uncommon variant with side speakers to "7.1(wide-side)".
* | lavu/internal: rename macro E(x) to EXPAND(x)Paul B Mahol2013-02-091-4/+4
| | | | | | | | | | | | Fixes bunch of warnings of E redefinition under clang. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer2013-02-091-0/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '218aefce4472dc02ee3f12830a9a894bf7916da9': dsputil: Move LOCAL_ALIGNED macros to libavutil Conflicts: libavcodec/dvdec.c libavcodec/imc.c libavcodec/mpegvideo_motion.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move LOCAL_ALIGNED macros to libavutilDiego Biurrun2013-02-081-0/+26
| |
* | lavu/parseutils: add digital cinema frame sizesDave Rice2013-02-032-1/+7
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | dict: fix memleakMichael Niedermayer2013-02-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: optimization for float aac decoder (core module)Mirjana Vulin2013-01-311-0/+117
| | | | | | | | | | Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avstring: fix "warning: return discards const qualifier from pointer target ↵Michael Niedermayer2013-01-301-2/+2
| | | | | | | | | | | | type" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dict.c: use av_mallocz instead of av_reallocPaweł Hajdan, Jr2013-01-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memory passed to av_realloc must come from malloc, calloc or realloc, and not e.g. memalign. realloc(3): The realloc() function changes the size of the memory block pointed to by ptr to size bytes. (...) Unless ptr is NULL, it must have been returned by an earlier call to malloc(), calloc() or realloc(). The issue has been found by debugallocation, a part of google-perftools: http://code.google.com/p/gperftools/ . This makes fate pass when using LD_PRELOAD-ed debugallocation. See also earlier discussion http://ffmpeg.org/pipermail/ffmpeg-devel/2013-January/137234.html Signed-off-by: Paweł Hajdan, Jr <phajdan@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eval: fix 'warning: ignoring return value of strtod, declared with attribute ↵Michael Niedermayer2013-01-291-1/+1
| | | | | | | | | | | | warn_unused_result' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'Michael Niedermayer2013-01-263-1/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '38c1466ca41c73c7ce347da702362cb69c151716': dict: add av_dict_parse_string() doc: support multitable in texi2pod Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dict: add av_dict_parse_string()Justin Ruggles2013-01-253-1/+65
| | | | | | | | | | | | Can be used to set multiple key/value pairs from a string. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'Michael Niedermayer2013-01-253-2/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b85a5e87af4254b80913fe33591d96361f30832b': lavu: Add av_strnstr() h264: Allow discarding the cropping information from SPS Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add av_strnstr()Vladimir Pantelic2013-01-253-1/+30
| | | | | | | | | | | | | | This is a length limited version of strstr() Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'Michael Niedermayer2013-01-251-60/+57
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '33552a5f7b6ec7057516f487b1a902331f8c353e': arm: Add mathops.h to ARCH_HEADERS list avstring: K&R formatting cosmetics Conflicts: libavutil/avstring.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avstring: K&R formatting cosmeticsLuca Barbato2013-01-241-59/+56
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavu/timecode: fix time code calculation for 60000/1001 drop frameJason2013-01-241-7/+10
| | | | | | | | | | Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/timecode: Allow drop frame mode for 60000/1001 fpsJason2013-01-242-3/+3
| | | | | | | | | | Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/eval: extend if/ifnot functions to accept a third parameterStefano Sabatini2013-01-242-3/+11
| | | | | | | | Add support to an if/else construct, simplify logic in expressions.
* | floatdsp: restrict->av_restrictMichael Niedermayer2013-01-242-2/+2
| | | | | | | | | | | | Fix msvc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eval: add function to access the current "wallclock" time.Michael Niedermayer2013-01-232-1/+8
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-231-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: rtpenc: fix overflow checking in avc_mp4_find_startcode() rtmp: fix buffer overflows in ff_amf_tag_contents() rtmp: fix multiple broken overflow checks float_dsp: Include config.h for redefining restrict Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * float_dsp: Include config.h for redefining restrictMartin Storsjö2013-01-231-0/+2
| | | | | | | | | | | | | | | | This makes sure that the restrict keyword is mapped to whatever keyword the compiler prefers/supports. This fixes building on MSVC (and possibly on GCC 2.x as well). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'Michael Niedermayer2013-01-236-1/+80
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73b704ac609d83e0be124589f24efd9b94947cf9': arm: Add some missing header #includes floatdsp: move scalarproduct_float from dsputil to avfloatdsp. Conflicts: libavcodec/acelp_pitch_delay.c libavcodec/amrnbdec.c libavcodec/amrwbdec.c libavcodec/ra288.c libavcodec/x86/dsputil_mmx.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move scalarproduct_float from dsputil to avfloatdsp.Ronald S. Bultje2013-01-226-0/+78
| | | | | | | | This makes the aac decoder and all voice codecs independent of dsputil.
* | Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'Michael Niedermayer2013-01-234-0/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '5959bfaca396ecaf63a8123055f499688b79cae3': floatdsp: move butterflies_float from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/imc.c libavcodec/mpegaudiodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move butterflies_float from dsputil to avfloatdsp.Ronald S. Bultje2013-01-224-0/+37
| | | | | | | | | | This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3) independent of dsputil.
OpenPOWER on IntegriCloud