summaryrefslogtreecommitdiffstats
path: root/libavfilter
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-132-4/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yadif: support 10bit YUVLuca Barbato2011-12-131-2/+5
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * build: move inclusion of subdir.mak to main subdir loopMans Rullgard2011-12-131-2/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | cleanup: for(intMichael Niedermayer2011-12-131-3/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: use the new audio API in amovie source filter.Clément Bœsch2011-12-131-25/+16
| |
* | lavfi: skip the frame in case of error.Clément Bœsch2011-12-131-1/+3
| | | | | | | | This fixes playback with some audio files through filters.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: misc consistency, spelling and wording fixes vcr1: drop unnecessary emms_c() calls without MMX code Replace all uses of av_close_input_file() with avformat_close_input(). lavf: add avformat_close_input(). lavf: deprecate av_close_input_stream(). lavf doxy: add some basic demuxing documentation. lavf doxy: add some general lavf information. lavf doxy: add misc utility functions to a group. lavf doxy: add av_guess_codec/format to the encoding group. lavf doxy: add core functions to a doxy group. Add basic libavdevice documentation. lavc: convert error_recognition to err_recognition. avconv: update -map option help text x86: Require 7 registers for the cabac asm x86: bswap: remove test for bswap instruction bswap: make generic implementation more compiler-friendly h264: remove useless cast proresdec: fix decode_slice() prototype Conflicts: configure doc/APIchanges ffprobe.c libavcodec/avcodec.h libavcodec/celp_math.h libavcodec/h264.c libavfilter/src_movie.c libavformat/anm.c libavformat/avformat.h libavformat/version.h libavutil/avstring.h libavutil/bswap.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: misc consistency, spelling and wording fixesDiego Biurrun2011-12-121-1/+1
| |
| * Replace all uses of av_close_input_file() with avformat_close_input().Anton Khirnov2011-12-121-1/+1
| |
| * lavfi: install libavfilter/vsrc_buffer.hAndrey Utkin2011-12-111-1/+1
| | | | | | | | | | | | It declares API necessary for filtering apps. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | timecode: rename internal ff_* symbols to avpriv_*.Clément Bœsch2011-12-121-1/+1
| | | | | | | | | | | | Those functions are shared between libs. Also fix a typo in function names: smtpe → smpte.
* | drawtext: allow burning the timecode.Clément Bœsch2011-12-121-1/+21
| |
* | life: add mold, mold_color, life_color and death_color options.Clément Bœsch2011-12-111-21/+106
| |
* | life: add seed information in filter summary.Clément Bœsch2011-12-111-2/+3
| |
* | lavfi: add cellauto sourceStefano Sabatini2011-12-114-1/+373
| |
* | buffersink: Implement a poll function.Michael Niedermayer2011-12-083-1/+15
| | | | | | | | | | | | With this the application can find out how many frames are available. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-081-6/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * drawtext: remove typoLuca Barbato2011-12-071-1/+1
| | | | | | | | It slipped through the last two iterations.
| * drawtext: introduce rand(min, max)Luca Barbato2011-12-071-7/+27
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * drawtext: introduce explicit draw/hide variableLuca Barbato2011-12-071-1/+10
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * drawtext: make x and y parametricLuca Barbato2011-12-031-8/+125
| | | | | | | | | | | | Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H", "text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with vf_overlay and refactor the code accordingly.
| * drawtext: manage memory allocation betterLuca Barbato2011-12-031-132/+132
| | | | | | | | | | Call dtext_prepare_text as early as possible Do not draw if the memory allocation failed
| * drawtext: refactor draw_textLuca Barbato2011-12-031-21/+46
| | | | | | | | Split the memory allocation from the actual drawing.
* | vsrc_life: fix comment in parse_rule()Stefano Sabatini2011-12-061-2/+2
| |
* | vf_scale: give a clue in case of invalid expression self-referenceStefano Sabatini2011-12-061-1/+3
| | | | | | | | Address trac ticket #706.
* | vf_scale: support PAL8 output by producing BGR8.Reimar Döffinger2011-12-051-4/+6
| | | | | | | | | | | | | | While quality is bad, PAL8 support is needed to allow testing some encoders that only support PAL8 input. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavfi: add life sourceStefano Sabatini2011-12-044-2/+414
| |
* | aevalsrc: add duration optionStefano Sabatini2011-12-042-2/+23
| |
* | vf_drawtext: support W/H parameters to reduce UI differences to qatarMichael Niedermayer2011-12-041-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_drawtext: cosmetics to reduce diff to qatarMichael Niedermayer2011-12-041-10/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_drawtext: Add main_w/h to improve compatibility with the modified UIMichael Niedermayer2011-12-041-6/+6
| | | | | | | | | | | | from the fork. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: align allocated images to 32 for AVX and IFFMichael Niedermayer2011-11-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: fix AVFilterPad video only comment.Clément Bœsch2011-11-261-2/+1
| |
* | lavfi: add libass based subtitles rendererStefano Sabatini2011-11-264-2/+246
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-263-7/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make channel layout masks unsignedMans Rullgard2011-11-254-11/+11
| | | | | | | | | | | | | | | | | | | | It makes more sense for a bit mask to use an unsigned type. The change should be source and binary compatible on all supported systems, hence micro version bump. Fixes a few invalid shifts. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | vf_boxblur: fix memleakMichael Niedermayer2011-11-251-1/+1
| | | | | | | | | | | | | | As the filter uses the default start frame, the cleanup done by the default end frame is needed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-243-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libavutil: add utility functions to simplify allocation of audio buffers. libavutil: add planar sample formats and av_sample_fmt_is_planar() avconv: fix segfault at EOF with delayed pictures pcmdec: remove unneeded resetting of samples pointer avconv: remove a now unused parameter from output_packet(). avconv: formatting fixes in output_packet() avconv: declare some variables in blocks where they are used avconv: use the same behavior when decoding audio/video/subs bethsoftvideo: return proper consumed size for palette packets. cdg: skip packets that don't contain a cdg command. crcenc: add flags avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats. tiffenc: add a private option for selecting compression algorithm md5enc: add flags ARM: remove needless .text/.align directives Conflicts: doc/APIchanges libavcodec/tiffenc.c libavutil/avutil.h libavutil/samplefmt.c libavutil/samplefmt.h tests/ref/fate/bethsoft-vid tests/ref/fate/cdgraphics tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/mpeg2-field-enc tests/ref/fate/nuv tests/ref/fate/tiertex-seq tests/ref/fate/tscc-32bit tests/ref/fate/vmnc-32bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavfilter: reindent.Ronald S. Bultje2011-11-051-7/+7
| |
| * avfilter: don't abort() on zero-size allocations.Ronald S. Bultje2011-11-051-3/+6
| |
* | vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be ↵Michael Niedermayer2011-11-241-1/+1
| | | | | | | | | | | | used uninitialized in this function [-Wuninitialized] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: Error out from avfilter_merge_formats() when there are duplicatesMichael Niedermayer2011-11-231-1/+6
| | | | | | | | | | | | instead of trying to continue. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_mp: rewrite vf_mp filter warning messageMichael Niedermayer2011-11-231-5/+4
| | | | | | | | | | Warning text by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: dont write out of array for duplicate formats in ↵Michael Niedermayer2011-11-231-1/+3
| | | | | | | | | | | | | | | | | | avfilter_merge_formats() Note, this is a theoretical fix, iam not aware of a case where this function receives duplicates in its input. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | graphparser: Fix doxy on avfilter_graph_parse() return value.Michael Niedermayer2011-11-221-1/+1
| | | | | | | | | | Found-by: ZacS123 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix various if parenthesis misplacements.Clément Bœsch2011-11-212-2/+2
| |
* | vsrc_mandelbrot: fix inner=period, the previous optimizations broke it.Michael Niedermayer2011-11-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_mandelbrot: increase maxiter to 7189Michael Niedermayer2011-11-191-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_mandelbrot: Use threshold to detect cycles.Michael Niedermayer2011-11-191-1/+4
| | | | | | | | | | | | This way cycles are detected much earlier. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_mandelbrot: detect edges in interpol()Michael Niedermayer2011-11-191-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud