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
2015-07-07Put a space between string literals and macros.Chris Watkins
When compiling libavutil/internal.h as C++11, clang warns that a space is required between a string literal and an identifier. Put spaces in concatenations of string literals and EXTERN_PREFIX. Signed-off-by: Chris Watkins <watk@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'Michael Niedermayer
* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2': configure: Support MSVC 2015 Conflicts: configure libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08configure: Support MSVC 2015Luca Barbato
The C runtime C99 compatibility had been improved a lot and it now rejects some of the compatibility defines provided for the older versions. Many thanks to Ray for the time spent testing. Bug-Id: 864 CC: libav-stable@libav.org
2015-05-06avutil/internal: Suppress empty body warning from emms_c()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-07configure: Make compilable with VS2015 (missing hunk)Peter Tissen
This hunk was missing in the github pull request when i downloaded it, but is needed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10avutil: move internal function out of public headerwm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05Factorize avpriv_mirror() outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'Michael Niedermayer
* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2': lavu: move internal define to the only places where it is used Conflicts: libavcodec/h264_cabac.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24lavu: move internal define to the only places where it is usedVittorio Giovara
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-04Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'Michael Niedermayer
* 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>
2014-08-04imgutils: Do not declare avpriv_set_systematic_pal2 in the public headerDiego Biurrun
2014-04-25lavu: add LOCAL_ALIGNED_32James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* 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>
2014-04-25Merge commit 'a88e1d1c598e641eecd5d43730211d91c82787c6'Michael Niedermayer
* commit 'a88e1d1c598e641eecd5d43730211d91c82787c6': lavu: add CHK_OFFS as AV_CHECK_OFFSET to check struct member offsets Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-24lavu: add CHK_OFFS as AV_CHECK_OFFSET to check struct member offsetsJanne Grunau
2014-04-24Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos
The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
2014-04-22avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTOMichael Niedermayer
These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26avutil/internal.h: add timer.h backMichael Niedermayer
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>
2014-01-26Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'Michael Niedermayer
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26avutil: remove timer.h include from internal.hJanne Grunau
Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
2013-12-09Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer
* commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09configure: Prefix libc-related variables with "libc_"Diego Biurrun
Simplifies host/target libc detection splitting.
2013-10-21Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.Carl Eugen Hoyos
2013-10-17lavu/channel_layout: change av_get_channel_layout() behavior at the next bumpStefano Sabatini
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.
2013-09-20Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'Michael Niedermayer
* commit '09f2581dc5edb3642858d69d9a70b67e249167e9': msvc/icl: Use __declspec(deprecated) Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20msvc/icl: Use __declspec(deprecated)Alex Smith
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>
2013-08-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libavutil: Make avpriv_open a library-internal function on msvcrt Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10Merge commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e'Michael Niedermayer
* commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e': libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10Integrate accessors.h header into internal.hReimar Döffinger
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>
2013-08-10libavutil: Make avpriv_open a library-internal function on msvcrtMartin Storsjö
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>
2013-08-10libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as ↵Martin Storsjö
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>
2013-08-08Merge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'Michael Niedermayer
* commit '869b04e89154cd92d2bcfdabcecbe3217864c099': libavutil: add avpriv_open() to open files with close-on-exec flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07libavutil: add avpriv_open() to open files with close-on-exec flagRémi Denis-Courmont
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-03Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'Michael Niedermayer
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b': build: Add _Pragma macro to disable deprecated declaration warnings Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02build: Add _Pragma macro to disable deprecated declaration warningsDiego Biurrun
2013-05-13lavu: define FF_MEMORY_POISON and use itStefano Sabatini
Allow single-place definition of constant used to fill poisoned memory.
2013-05-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: msvc: Move linker pragma from config.h to libavutil/internal.h Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08msvc: Move linker pragma from config.h to libavutil/internal.hMartin Storsjö
This makes linking succeed for tools that include config.h but don't link to libavutil. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-14Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'Michael Niedermayer
* 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>
2013-03-13Add av_log_{ask_for_sample|missing_feature} replacements to libavutilDiego Biurrun
This allows reporting missing features and requesting samples from all libraries in a standard way; with a simplified API.
2013-02-15Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'Michael Niedermayer
* 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>
2013-02-14avutil: Ensure that emms_c is always defined, even on non-x86Diego Biurrun
2013-02-14avutil: Move emms code to x86-specific headerDiego Biurrun
2013-02-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-02-12lavu: avoid clashing definition of ELuca Barbato
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.
2013-02-09lavu/internal: rename macro E(x) to EXPAND(x)Paul B Mahol
Fixes bunch of warnings of E redefinition under clang. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer
* 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>
2013-02-09dsputil: Move LOCAL_ALIGNED macros to libavutilDiego Biurrun