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
2012-10-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avutil: Make LZO decoder code configure-time selectable avutil: Move memcpy_backptr() to mem.c configure: detect parisc64 automatically configure: detect ppc64 automatically configure: detect mips64 automatically configure: generalise 64-bit test smoothstreamingenc: Don't assume streams start from timestamp 0 Conflicts: configure libavutil/Makefile libavutil/lzo.c libavutil/lzo.h libavutil/mem.c libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25avutil: Move memcpy_backptr() to mem.cDiego Biurrun
The function is used elsewhere and does not belong with the LZO code.
2012-10-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: Group math functions into a separate variable avutil/mem: K&R formatting cosmetics avutil/lzo: K&R formatting cosmetics Conflicts: configure libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20avutil/mem: K&R formatting cosmeticsDiego Biurrun
2012-09-10mem: fix typo in check for __ICCMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-07-14mem: introduce av_malloc_array and av_mallocz_arrayLuca Barbato
Both function ease allocating large arrays implementing the overflow check inside it.
2011-12-25mem: add av_max_alloc() to limit the maximum amount that may be allocated in ↵Michael Niedermayer
one piece Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22doxy: provide a start page and document libavutilLuca Barbato
Introduce a basic layout, the subpages are currently left empty. Split libavutil in multiple groups as example of the structure
2011-09-28Introduce av_realloc_f.Nicolas George
av_realloc_f helps avoiding memory-leaks in typical uses of realloc. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28Introduce av_size_mult.Nicolas George
av_size_mult helps checking for overflow when computing the size of a memory area. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Add av_calloc() helper.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: Automatically add more flags required on symbian mem.h: switch doxygen parameter order to match function prototype doxygen: replace @sa tag by the more readable but equivalent @see doxygen: use Doxygen markup for authors and web links where appropriate doxygen: do not include license boilerplate in Doxygen documentation ac3enc: Mark AVClasses const ffserver: Replace two loops with one loop. ffmpeg: Fix the check for experimental codecs swscale: extend mmx padding. swscale: clip unscaled colorspace conversion path. doxygen: misc consistency cosmetics doc: remove file name from @file directive in Doxygen usage example doxygen: consistently place brief description doxygen: place empty line between brief description and detailed description avformat_open_input(): Add braces to shut up gcc warning. Conflicts: libavcodec/8svx.c libavcodec/tiff.c libavcodec/tiff.h libavcodec/vaapi_h264.c libavcodec/vorbis.c libavcodec/vorbisdec.c libavcodec/vp6.c libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-15mem.h: switch doxygen parameter order to match function prototypeDiego Biurrun
2011-05-01Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'Michael Niedermayer
* commit '85770f2a2651497861ed938efcd0df3696ff5e45': AVOptions: make default_val a union, as proposed in AVOption2. Move ff_dynarray_add to lavu and make it public. lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. options: simplify av_find_opt by using av_next_option. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-29Move ff_dynarray_add to lavu and make it public.Anton Khirnov
2011-04-20Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-19lavu: remove misc disabled cruftAnton Khirnov
2011-03-24Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-23Remove unnecessary icc version checksMans Rullgard
With unknown attribute warnings disabled, these checks are no longer needed. Removing them improves readability while having no effect on generated code. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-03Attribute used is correctly supported by the Intel C compiler since version ↵Carl Eugen Hoyos
11.1.
2011-03-02Use macro __INTEL_COMPILER instead of __ICC.Carl Eugen Hoyos
__ICC is not supported on all platforms, this is an Intel documentation bug that is supposed to be fixed in a future release. (Intel issue 612289)
2011-01-31Rename attribute_used to av_used and move it to attributes.hMans Rullgard
This is consistent with most of the other attribute macros. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 365e3c7878e4e821d5dec922d2d51f92ce13f926)
2011-01-31Rename attribute_used to av_used and move it to attributes.hMans Rullgard
This is consistent with most of the other attribute macros. Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-12-22Add av_file_map() and av_file_unmap() functions.Stefano Sabatini
Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04Change the argument of memory allocation functions from unsigned int to size_tMichael Niedermayer
with the next major bump in libavutil. Originally committed as revision 25871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-10Intel C compiler 12.0 does not suport these attributes: may_alias, ↵Carl Eugen Hoyos
force_align_arg_pointer and alloc_size. Originally committed as revision 25716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30Fix grammar errors in documentationMåns Rullgård
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26Add missing avutil.h include to libavutil/mem.hMåns Rullgård
Originally committed as revision 23803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-16icc 12 finally fixed attribute(used) so gcc's DECLARE_ASM_CONST can be used.Carl Eugen Hoyos
Originally committed as revision 23624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09Replace many includes of libavutil/common.h with what is actually neededMåns Rullgård
This reduces the number of false dependencies on header files and speeds up compilation. Originally committed as revision 22407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård
These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06Move DECLARE_ALIGNED_{8,16} macros to mem.hMåns Rullgård
These macros naturally belong next to the generic DECLARE_ALIGNED macro. Originally committed as revision 22230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22DECLARE_ALIGNED macro for TMS470 compilerMåns Rullgård
This compiler supports gcc-style alignment attributes for struct, but not for global variables. For the latter, alignment can be specified with a pragma, which does not work for struct members or local variables. By using both pragma and attribute, one or the other will always take effect. Unfortunately, no means exists for aligning stack variables. Originally committed as revision 21379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21Make DECLARE_ALIGNED macros work with external array specifiersMåns Rullgård
The macro implementation might need the name of the variable being declared for compiler-specific syntax. Moving array specifiers outside the macro invocation allows this to work. Originally committed as revision 21363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01Remove residual use of the doxygen markup which is deprecated,Stefano Sabatini
consistent with r19122. Originally committed as revision 20989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09Move DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h toRamiro Polla
lavu/mem.h. Originally committed as revision 19384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-27Icc 11.1 does not support attributes force_align_arg_pointer, alloc_size and ↵Carl Eugen Hoyos
cold. Originally committed as revision 19282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06Remove '\p', '\c' and '\e' doxygen markup from doxy, as it shouldStefano Sabatini
improve plain text doxy readability. See the thread: "[RFC] Should we use doxygen markup?". Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01Use full internal pathname in doxygen @file directives.Diego Biurrun
Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-28spelling/grammar/consistency review part IDiego Biurrun
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25Move DECLARE_ALIGNED and DECLARE_ASM_CONST to internal.h.Diego Biurrun
Their definition depends on preprocessor directives from config.h, thus they cannot be declared in a public header since public headers cannot #include config.h. Originally committed as revision 16781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24Directly #include a bunch of indirectly #included headers.Diego Biurrun
Originally committed as revision 16748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs
They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22Silence the following icc warnings:Carl Eugen Hoyos
warning #1292: attribute "force_align_arg_pointer" ignored warning #1292: attribute "alloc_size" ignored warning #1292: attribute "cold" ignored Originally committed as revision 16258 to svn://svn.ffmpeg.org/ffmpeg/trunk