summaryrefslogtreecommitdiffstats
path: root/libavfilter
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-043-6/+136
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: reclassify showfiltfmts as a TESTPROGMans Rullgard2012-07-042-2/+109
| | | | | | | | | | | | | | | | This tool uses lavfi internal symbols not accessible in shared libraries. TESTPROGS are linked statically to allow them use of library internals not normally exported. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Clarify Doxygen comment for FF_API_* #defines.Diego Biurrun2012-07-041-2/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-044-19/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Consistently use C-style comments with multiple inclusion guards anm: fix a few Doxygen comments misc typo and wording fixes attributes: add av_noreturn attributes: drop pointless define guards configure: do not disable av_always_inline with --enable-small flvdec: initial stream switch support avplay: fix write on freed memory for rawvideo snow: remove a VLA used for edge emulation x86: lavfi: fix gradfun/yadif build with mmx/sse disabled snow: remove the runs[] VLA. snow: Check mallocs at init flacdec: remove redundant setting of avctx->sample_fmt Conflicts: ffplay.c libavcodec/h264.c libavcodec/snow.c libavcodec/snow.h libavcodec/snowdec.c libavcodec/snowenc.c libavformat/flvdec.c libavutil/attributes.h tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Consistently use C-style comments with multiple inclusion guardsDiego Biurrun2012-07-032-2/+2
| |
| * misc typo and wording fixesDiego Biurrun2012-07-031-1/+1
| |
| * x86: lavfi: fix gradfun/yadif build with mmx/sse disabledMans Rullgard2012-07-032-6/+18
| | | | | | | | | | | | | | These functions are defined conditionally so any uses need to have preprocessor guards. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Suggest aresample filter if it was not compiled but requested.Carl Eugen Hoyos2012-07-031-1/+1
| |
* | yadif/x86: add prototypes for functions, make code valid C again.Michael Niedermayer2012-07-031-0/+4
| | | | | | | | | | Broken by: libav (a87b17f3283aada762820f1b797eeb7a2dff6c61) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: remove vsrc_buffer.h APIStefano Sabatini2012-07-034-101/+1
| | | | | | | | | | | | | | The vsrc_buffer.h is not installed since commit 0b3b95813576, so there is no point into keeping it around. The buffersrc.h API, which is more powerful, should be used instead.
* | x86/gradfun: fix compilation failure on open solarisMichael Niedermayer2012-07-021-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-027-75/+80
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asfdec: read attached pictures. apetag: reindent apetag: export attached covers as video streams. apetag: fix the amount of data read from binary tags. apetag: make sure avio_get_str() doesn't read more than it should. mov: read itunes cover art. snow: remove VLA in mc_block() intfloat: Don't use designated initializers in the public headers snow: remove a VLA. doc: Remind devs to check return values, especially for malloc() et al MS ATC Screen (aka MSS3) decoder vf_yadif: move x86 init code to x86/yadif.c vf_gradfun: move x86 init code to x86/gradfun.c roqvideo: Remove a totally unused dspcontext smacker: remove some unused code dsicin: remove dead assignment aacdec: remove dead assignment rl2: remove dead assignment proresenc: make a variable local to the loop where it is used alsdec: remove dead assignments Conflicts: Changelog doc/developer.texi libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavfilter/gradfun.h libavfilter/x86/gradfun.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_yadif: move x86 init code to x86/yadif.cMans Rullgard2012-07-024-55/+55
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vf_gradfun: move x86 init code to x86/gradfun.cMans Rullgard2012-07-023-20/+25
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | sink_buffer: implement fixed frame size.Nicolas George2012-06-302-0/+17
| |
* | lavfi: implement samples framing on links.Nicolas George2012-06-304-4/+91
| | | | | | | | | | Links can be set up to group samples into buffers of specified minimum and maximum size.
* | vf_ass: fix table name to refer to correct lib.Michael Niedermayer2012-06-291-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | formats.h: fix project reference in commentMichael Niedermayer2012-06-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: deprecate av_buffersrc_buffer() functionStefano Sabatini2012-06-283-0/+9
| | | | | | | | Favor av_buffersrc_add_ref() instead, which is more powerful.
* | sink_buffer: warn when there are too many buffers.Nicolas George2012-06-281-0/+10
| |
* | buffersrc: warn when there are too many buffers.Nicolas George2012-06-281-0/+11
| |
* | lavfi/amerge: silence warningsPaul B Mahol2012-06-281-1/+1
| | | | | | | | | | | | | | | | The warning silenced was: libavfilter/af_amerge.c:144:29: warning: conversion specifies type 'long long' but the argument has type 'int' [-Wformat] The warning was introduced after FF_API_SAMPLERATE64 removal. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-2727-116/+125
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: add an assert to silence an uninitialized variable warning. avconv: shut up an uninitialized variable warning. avfiltergraph: shut up uninitialized variable warning. af_join: initialize a variable to shut up gcc warning. amix: fix format specifier for AVFilterLink.sample_rate. lavfi: make filters less verbose. mpc8: read APE tags. lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes libm: provide fallback definition for cbrtf() using powf() network: Don't redefine error codes if they already exist in errno.h configure: Check for sys/time.h network: Include unistd.h from network.h avconv: don't include vsrc_buffer.h, which doesn't exist anymore lavfi: reorder AVFilterLink fields. lavfi: reorder AVFilterContext fields. lavfi: reorder AVFilter fields. lavfi: reorder AVFilterBufferRef fields. lavfi: reorder AVFilterBuffer fields. Conflicts: configure libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_crop.c libavfilter/vf_drawbox.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vsrc_color.c libavformat/network.h libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: shut up uninitialized variable warning.Anton Khirnov2012-06-261-1/+3
| | | | | | | | | | | | The warning silenced was: libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’: libavfilter/avfiltergraph.c:500:13: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]
| * af_join: initialize a variable to shut up gcc warning.Anton Khirnov2012-06-261-1/+2
| | | | | | | | | | | | The warning silenced was: libavfilter/af_join.c: In function ‘join_request_frame’: libavfilter/af_join.c:451:9: warning: ‘nb_samples’ may be used uninitialized in this function [-Wuninitialized]
| * amix: fix format specifier for AVFilterLink.sample_rate.Anton Khirnov2012-06-261-1/+1
| | | | | | | | It is a plain int now.
| * lavfi: make filters less verbose.Anton Khirnov2012-06-2626-38/+37
| |
| * lavfi: reorder AVFilterLink fields.Anton Khirnov2012-06-261-27/+27
| | | | | | | | Move private fields to the private section, remove holes.
| * lavfi: reorder AVFilterContext fields.Anton Khirnov2012-06-261-7/+6
| | | | | | | | Place related fields together, remove holes.
| * lavfi: reorder AVFilter fields.Anton Khirnov2012-06-261-9/+17
| | | | | | | | | | Place related fields together, remove holes, move private fields to the end and mark them as private.
| * lavfi: reorder AVFilterBufferRef fields.Anton Khirnov2012-06-261-17/+18
| | | | | | | | Place related fields together, remove holes.
| * lavfi: reorder AVFilterBuffer fields.Anton Khirnov2012-06-261-16/+15
| | | | | | | | Place related fields together, remove holes.
* | Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'Michael Niedermayer2012-06-2712-388/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1961e46c15c23a041f8d8614a25388a3ee9eff63': lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft lavfi: use proper FF_API guards for different deprecated functions lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft lavfi: remove disabled FF_API_SAMPLERATE64 cruft lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft Conflicts: libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/graphparser.c libavfilter/version.h libavfilter/video.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove disabled FF_API_FILTERS_PUBLIC cruftAnton Khirnov2012-06-266-245/+0
| |
| * lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruftAnton Khirnov2012-06-263-15/+0
| |
| * lavfi: use proper FF_API guards for different deprecated functionsAnton Khirnov2012-06-261-0/+2
| |
| * lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruftAnton Khirnov2012-06-264-61/+0
| |
| * lavfi: remove disabled FF_API_SAMPLERATE64 cruftAnton Khirnov2012-06-263-11/+0
| |
| * lavfi: remove disabled FF_API_GRAPH_AVCLASS cruftAnton Khirnov2012-06-264-20/+6
| |
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-2664-91/+94
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-2644-60/+57
| | | | | | | | | | | | It is not used in any filters currently and is inherently evil. If passing binary data to filters is required in the future, it should be done with some AVOptions-based system.
* | sink_buffer: make opaque argument optional.Nicolas George2012-06-261-16/+20
| |
* | buffersink: group libav API functions.Nicolas George2012-06-261-2/+11
| |
* | lavfi: drop deprecated and disabled packing APIStefano Sabatini2012-06-265-58/+0
| | | | | | | | It was deprecated and removed after the recent 2->3 major bump.
* | lavfi: remove old video sink APIStefano Sabatini2012-06-263-26/+2
| | | | | | | | | | It was deprecated since a long time and removed after the 2->3 major bump.
* | lavfi/drawtext: use av_opt_free() to free private contextStefano Sabatini2012-06-251-10/+1
| | | | | | | | Simplify code.
* | lavfi/abuffer: increase logging level of the log showing initial parametersStefano Sabatini2012-06-251-2/+3
| | | | | | | | Also show them in a more parsable/consistent fashion.
* | lavfi/avfilter.h: reorganize headers dispositionStefano Sabatini2012-06-251-2/+2
| | | | | | | | Group lavfi headers together, slightly improve readability.
* | lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref APIStefano Sabatini2012-06-253-0/+13
| | | | | | | | | | | | | | | | | | | | | | Deprecate functions: avfilter_fill_frame_from_buffer_ref avfilter_fill_frame_from_audio_buffer_ref avfilter_fill_frame_from_video_buffer_ref and schedule to drop them at the next API major bump. The function avfilter_copy_buf_props() should be used instead.
* | lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.hStefano Sabatini2012-06-2511-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | libavfilter API was designed in order to be clarly distinguished from the libavcodec API, including avcodec.h in avfilter.h is not going to help to stick to this principle. The inclusion of libavutil/audioconvert.h in many files was required because avcodec.h includes audioconvert.h. libavfilter/avcodec.h is where the lavc/lavfi interface should be entirely placed.
OpenPOWER on IntegriCloud