summaryrefslogtreecommitdiff
path: root/libavutil/internal.h
Commit message (Collapse)AuthorAge
* Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'Michael Niedermayer2014-08-04
|\ | | | | | | | | | | | | | | | | | | | | * commit 'bb41115d56930b9f5d59e79dca254d1201246967': imgutils: Do not declare avpriv_set_systematic_pal2 in the public header Conflicts: libavutil/internal.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * imgutils: Do not declare avpriv_set_systematic_pal2 in the public headerDiego Biurrun2014-08-04
| |
* | lavu: add LOCAL_ALIGNED_32James Almer2014-04-25
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Enable muxing ac-3 in caf. Use correct msvc type specifiers for ptrdiff_t and size_t. Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS. Fix libpostproc compilation with !HAVE_6REGS. Never write 0 as maximum bitrate for asf files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos2014-04-24
| | | | | | | | | | | | | | | | | | | | | The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
* | | Merge commit 'a88e1d1c598e641eecd5d43730211d91c82787c6'Michael Niedermayer2014-04-25
|\ \ \ | |/ / |/| / | |/ | | | | | | * commit 'a88e1d1c598e641eecd5d43730211d91c82787c6': lavu: add CHK_OFFS as AV_CHECK_OFFSET to check struct member offsets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add CHK_OFFS as AV_CHECK_OFFSET to check struct member offsetsJanne Grunau2014-04-24
| |
* | avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTOMichael Niedermayer2014-04-22
| | | | | | | | | | | | These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/internal.h: add timer.h backMichael Niedermayer2014-01-26
| | | | | | | | | | | | | | | | | | Without this a developer would have to add a include every time he wants to benchmark some code, this is a moderate inconvenience. This reverts the specific hunk from fb0c9d41d685abb58575c5482ca33b8cd457c5ec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'Michael Niedermayer2014-01-26
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: remove timer.h include from internal.hJanne Grunau2014-01-25
| | | | | | | | Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
* | Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Prefix libc-related variables with "libc_"Diego Biurrun2013-12-09
| | | | | | | | Simplifies host/target libc detection splitting.
* | Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.Carl Eugen Hoyos2013-10-21
| |
* | lavu/channel_layout: change av_get_channel_layout() behavior at the next bumpStefano Sabatini2013-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new syntax is preferred since it allows backward syntax compatibility with libswr when switching to the new option handling code with AV_OPT_TYPE_CHANNEL_LAYOUT. With the new parser the string: 1234 is interpreted as a channel layout mask, rather than as a number of channels, and thus it's compatible with the current way to set a channel layout as an integer (e.g. for the icl and ocl options) making use of integer option values. ff_get_channel_layout() with compat=0 will be used in the AV_OPT_TYPE_CHANNEL handler code. The user is encouraged to switch to the new forward compatible syntax, which requires to put a trailing "c" when specifying a layout as a number of channels.
* | Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | * commit '09f2581dc5edb3642858d69d9a70b67e249167e9': msvc/icl: Use __declspec(deprecated) Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msvc/icl: Use __declspec(deprecated)Alex Smith2013-09-20
| | | | | | | | | | | | | | | | | | | | | | Prior to this on msvc/icl there was no handling of deprecated functions and the deprecated warning was disabled. After enabling there are a number of warnings relating to the CRT and the use of the non-secure versions of several functions. Defining _CRT_SECURE_NO_WARNINGS silences these warnings. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | * qatar/master: libavutil: Make avpriv_open a library-internal function on msvcrt Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Make avpriv_open a library-internal function on msvcrtMartin Storsjö2013-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add one copy of the function into each of the libraries, similarly to what we do for log2_tab. When using static libs, only one copy of the file_open.o object file gets included, while when using shared libraries, each of them get a copy of its own. This fixes DLL builds with a statically linked C runtime, where each DLL effectively has got its own instance of the C runtime, where file descriptors can't be shared across runtimes. On systems not using msvcrt, the function is not duplicated. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | * commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e': libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as ↵Martin Storsjö2013-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well This used to only be necessary in static builds (when using the dynamically linked C runtime), since the _imp prefixed symbols do exist when linking to the actual DLL. When building testprogs, however, the current library (e.g. libavutil for some of the testprogs) is linked statically. This fixes make fate on DLL builds when using the dynamically linked C runtime. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Integrate accessors.h header into internal.hReimar Döffinger2013-08-10
| | | | | | | | | | | | | | I have no idea why I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '869b04e89154cd92d2bcfdabcecbe3217864c099': libavutil: add avpriv_open() to open files with close-on-exec flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: add avpriv_open() to open files with close-on-exec flagRémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | * commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b': build: Add _Pragma macro to disable deprecated declaration warnings Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add _Pragma macro to disable deprecated declaration warningsDiego Biurrun2013-08-02
| |
* | lavu: define FF_MEMORY_POISON and use itStefano Sabatini2013-05-13
| | | | | | | | Allow single-place definition of constant used to fill poisoned memory.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | | | | | | | * qatar/master: msvc: Move linker pragma from config.h to libavutil/internal.h Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msvc: Move linker pragma from config.h to libavutil/internal.hMartin Storsjö2013-05-08
| | | | | | | | | | | | | | This makes linking succeed for tools that include config.h but don't link to libavutil. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'Michael Niedermayer2013-03-14
|\| | | | | | | | | | | | | | | * commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8': Add av_log_{ask_for_sample|missing_feature} replacements to libavutil ismindex: Check the return value of allocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_log_{ask_for_sample|missing_feature} replacements to libavutilDiego Biurrun2013-03-13
| | | | | | | | | | This allows reporting missing features and requesting samples from all libraries in a standard way; with a simplified API.
* | Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'Michael Niedermayer2013-02-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-14
| |
| * avutil: Move emms code to x86-specific headerDiego Biurrun2013-02-14
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-12
|\| | | | | | | | | | | | | | | | | | | | | * 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-12
| | | | | | | | | | 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.
* | lavu/internal: rename macro E(x) to EXPAND(x)Paul B Mahol2013-02-09
| | | | | | | | | | | | Fixes bunch of warnings of E redefinition under clang. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer2013-02-09
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-08
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-19
|\| | | | | | | | | | | | | | | * qatar/master: x86: dsputil: Drop some unused macro definitions x86: Add a Yasm-based emms() replacement Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Add a Yasm-based emms() replacementMartin Storsjö2013-01-18
| | | | | | | | | | | | | | This provides a fallback when building with Yasm enabled, but neither inline assembly, nor the _mm_empty intrinsic are available or enabled. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * remove #defines to prevent use of discouraged external functionsJanne Grunau2012-11-25
| | | | | | | | | | | | | | | | | | | | | | Preventing the use of discouraged or 'insecure' external functions through defines in an internal header is not a good solution. The header is not guaranteed to be included universally which makes overlooking bad use of said functions during review more likely. There are cases were those functions either are the most straight forward solution or even have to be used. Using malloc or free is required if the allocation or release is done by other libraries.
* | lavu: drop time redefinition as it causes some problems in some uncommon ↵Michael Niedermayer2012-11-26
| | | | | | | | | | | | | | configurations. Based-on: e96d90eed66a198566c409958432d282e1b03869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'Michael Niedermayer2012-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72': fate: add a dependency helper macro Add support for building shared libraries with MSVC avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab gxf: Add a local copy of the relevant parts of the frame rate table configure: Split out msvc as a separate target OS aviobuf: Remove a senseless ifdef in avio_seek Conflicts: configure libavcodec/dirac.c libavcodec/mpeg12data.h libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add support for building shared libraries with MSVCMartin Storsjö2012-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires the makedef perl script by Derek, from the c89-to-c99 repo. That scripts produces a .def file, listing the symbols to be exported, based on the gcc version scripts and the built object files. To properly load non-function symbols from DLL files, the data symbol declarations need to have the attribute __declspec(dllimport) when building the calling code. (On mingw, the linker can fix this up automatically, which is why it has not been an issue so far. If this attribute is omitted, linking actually succeeds, but reads from the table will not produce the desired results at runtime.) MSVC seems to manage to link DLLs (and run properly) even if this attribute is present while building the library itself (which normally isn't recommended) - other object files in the same library manage to link to the symbol (with a small warning at link time, like "warning LNK4049: locally defined symbol _avpriv_mpa_bitrate_tab imported" - it doesn't seem to be possible to squelch this warning), and the definition of the tables themselves produce a warning that can be squelched ("warning C4273: 'avpriv_mpa_bitrate_tab' : inconsistent dll linkage, see previous definition of 'avpriv_mpa_bitrate_tab'). In this setup, mingw isn't able to link object files that refer to data symbols with __declspec(dllimport) without those symbols actually being linked via a DLL (linking avcodec.dll ends up with errors like "undefined reference to `__imp__avpriv_mpa_freq_tab'"). The dllimport declspec isn't needed at all in mingw, so we simply choose not to declare it for other compilers than MSVC that requires it. (If ICL support later requires it, the condition can be extended later to include both of them.) This also implies that code that is built to link to a certain library as a DLL can't link to the same library as a static library. Therefore, we only allow building either static or shared but not both at the same time. (That is, static libraries as such can be, and actually are, built - this is used for linking the test tools to internal symbols in the libraries - but e.g. libavformat built to link to libavcodec as a DLL cannot link statically to libavcodec.) Also, linking to DLLs is slightly different from linking to shared libraries on other platforms. DLLs use a thing called import libraries, which is basically a stub library allowing the linker to know which symbols exist in the DLL and what name the DLL will have at runtime. In mingw/gcc, the import library is usually named libfoo.dll.a, which goes next to a static library named libfoo.a. This allows gcc to pick the dynamic one, if available, from the normal -lfoo switches, just as it does for libfoo.a vs libfoo.so on Unix. On MSVC however, you need to literally specify the name of the import library instead of the static library. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'Michael Niedermayer2012-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29abb04e73b0580ebe38703cadb988d26df6a76a': libspeexdec: If the channel count is not valid, decode as stereo. libspeexdec: improve setting of Speex mode and sample rate libspeex: Add a private option for enabling VAD xtea: Test inplace decryption xtea: Fix CBC decryption when src==dst xtea: Factorize testing into a separate function configure: Refactor HAVE_ options available on the command line avconv/avprobe: Add missing 'void' to exit_program() definition Allow use of strncpy() blowfish: Add more tests blowfish: Fix CBC decryption with dst==src blowfish: Factorize testing into a separate function Conflicts: configure libavcodec/libspeexdec.c libavutil/xtea.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Allow use of strncpy()Mans Rullgard2012-10-03
| | | | | | | | | | | | | | | | There are cases where strncpy() does exactly what is required. A blanket ban forces more convoluted solutions to be used in those cases and has been a cause of bugs. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MSS1 and MSS2: set final pixel format after common stuff has been initialised MSS2 decoder configure: handle --disable-asm before check_deps x86: Split inline and external assembly #ifdefs configure: x86: Separate inline from standalone assembler capabilities pktdumper: Use a custom define instead of PATH_MAX for buffers pktdumper: Use av_strlcpy instead of strncpy pktdumper: Use sizeof(variable) instead of the direct buffer length Conflicts: Changelog configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/dct-test.c libavcodec/imgconvert.c libavcodec/mss12.c libavcodec/version.h libavfilter/x86/gradfun.c libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Split inline and external assembly #ifdefsDiego Biurrun2012-08-31
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 12:24:13 +0000