summaryrefslogtreecommitdiff
path: root/libavcodec/motion_est_template.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-121-18/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * motion_est: make MotionExtContext.map_generation unsignedMans Rullgard2011-10-111-18/+18
| | | | | | | | | | | | | | | | The way this value is used, it should be an unsigned type. While the numerical value has no meaning, unsigned wraparound is relied upon. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-141/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * motion_est: remove disabled codeDiego Biurrun2011-07-171-141/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Drop array size declarations from Doxygen parameter names.Diego Biurrun2011-07-031-1/+1
| | | | | | | | Adding [] to a Doxygen parameter name clashes with Doxygen syntax.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-241-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Consistently use '@' instead of '\' for Doxygen markup.Diego Biurrun2011-06-241-4/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-1/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-301-35/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Duplicate AMV: disable DR1 and don't override EMU_EDGE Duplicate lavf: inspect more frames for fps when container time base is coarse Wrong and we have correct fix: Fix races in default av_log handler vorbis: Replace sized int_fast integer types with plain int/unsigned. Remove disabled non-optimized code variants. NO bswap.h: Remove disabled code. Remove some disabled printf debug cruft. Replace more disabled printf() calls by av_dlog(). NO tests: Remove disabled code. NO Replace some commented-out debug printf() / av_log() messages with av_dlog(). vorbisdec: Replace some sizeof(type) by sizeof(*variable). NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. Conflicts: libavcodec/h264.c libavcodec/vorbisdec.c libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove some disabled printf debug cruft.Diego Biurrun2011-04-291-35/+0
| |
* | Revert "Eliminate pointless '#if 1' statements without matching '#else'."Michael Niedermayer2011-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | no comment This reverts commit e6ff064845d02c43526c8a56dab121c219f16659. Conflicts: libavcodec/dsputil.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Eliminate pointless '#if 1' statements without matching '#else'.Diego Biurrun2011-04-261-2/+0
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Restore array sizes in doxygen parameter names.Diego Biurrun2010-07-081-1/+1
| | | | Originally committed as revision 24108 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid square brackets in Doxygen comments; Doxygen chokes on them.Diego Biurrun2010-07-021-1/+1
| | | | Originally committed as revision 23979 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* slice dice, inline and outline cmp()Michael Niedermayer2010-04-021-2/+2
| | | | | | | motion_est.o is now less than half its previous size. No speedchange meassureable. Originally committed as revision 22771 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* cosmetics: Fix two common typos: wont --> will not, lets --> let us.Diego Biurrun2008-07-241-1/+1
| | | | Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
* New full search MEMichael Niedermayer2008-07-091-0/+37
| | | | Originally committed as revision 14142 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add FF_ prefix to all (frame)_TYPE usageAurelien Jacobs2008-03-091-1/+1
| | | | Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* license header consistency cosmeticsDiego Biurrun2007-07-051-1/+0
| | | | Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename attribute_unused to av_unused and moves its declaration to common.hCarl Eugen Hoyos2007-05-301-5/+5
| | | | | | | | patch by Carl Eugen Hoyos cehoyos chez ag or at original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused date: 05/29/2007 01:23 PM Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk
* doxy comment tweaksLoren Merritt2007-03-311-1/+1
| | | | Originally committed as revision 8580 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add doxy comments, based on Loren's explanations posted here:Guillaume Poirier2007-03-311-2/+13
| | | | | | | Date: Mar 30, 2007 9:00 PM Subject: Re: [Ffmpeg-devel] Motion Estimation in snow.c for Waevelet encoded frames (DWT) Originally committed as revision 8579 to svn://svn.ffmpeg.org/ffmpeg/trunk
* test DIRECT{0,0} too if flag mv0 is usedMichael Niedermayer2006-12-221-1/+1
| | | | | | slight PSNR/bitrate increase Originally committed as revision 7361 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix special casing of the 0,0 MV for b frames (slight PSNR/bitrate gain)Michael Niedermayer2006-12-201-1/+3
| | | | Originally committed as revision 7334 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dont favor the zero MV if mv0 is used (psnr per bitrate gains ranging from 0 ↵Michael Niedermayer2006-12-201-0/+2
| | | | | | to 0.14, most are <=0.04 though) Originally committed as revision 7333 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mv overflow in map fix (untested except regression tests)Michael Niedermayer2006-12-121-3/+10
| | | | Originally committed as revision 7287 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename always_inline to av_always_inline and move to common.hMåns Rullgård2006-12-081-3/+3
| | | | Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l umh search needs hex size 2 now after the last changeMichael Niedermayer2006-12-051-1/+1
| | | | Originally committed as revision 7224 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make hex and large 2 small diamond search half their size instead or -1 if ↵Michael Niedermayer2006-12-051-16/+15
| | | | | | | | the initial size was a power of 2 double the hex size so odd sized hexagons are possible Originally committed as revision 7223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling cosmetics: cliped --> clippedDiego Biurrun2006-12-021-30/+30
| | | | Originally committed as revision 7208 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix indentionMichael Niedermayer2006-12-021-17/+17
| | | | Originally committed as revision 7206 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dia_size=-1 -> funny_diamond_search()Michael Niedermayer2006-12-021-4/+7
| | | | | | dia_siue=768 + size -> umh search (old -1 was 784) Originally committed as revision 7205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* hexagon searchMichael Niedermayer2006-12-021-19/+78
| | | | | | | | dia_size=512 + hexagon size (513 is the normal one used in h264) large to small diamond search dia_size=256 + diamond size Originally committed as revision 7204 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove pretty much useless skiping of some predictorsMichael Niedermayer2006-12-011-6/+0
| | | | | | this has pretty much no quality or speed effect except very small random changes Originally committed as revision 7202 to svn://svn.ffmpeg.org/ffmpeg/trunk
* typo in umhMichael Niedermayer2006-12-011-1/+1
| | | | Originally committed as revision 7193 to svn://svn.ffmpeg.org/ffmpeg/trunk
* UMH support (dia_size=-1 activates it)Michael Niedermayer2006-12-011-1/+65
| | | | Originally committed as revision 7192 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic (prevent name clashes of variables in a macro with surrounding code)Michael Niedermayer2006-12-011-5/+5
| | | | Originally committed as revision 7191 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 1 step diamond search around the median MV predictorMichael Niedermayer2006-11-301-1/+5
| | | | | | | +0.01 PSNR idea from x264 Originally committed as revision 7189 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename ABS macro to FFABS.Diego Biurrun2006-10-111-5/+5
| | | | Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fixes:Dominik Mierzejewski2006-10-081-1/+1
| | | | | | | | | mpegvideo.h:777: warning: ‘inline’ is not at beginning of declaration motion_est_template.c:236: warning: ‘inline’ is not at beginning of declaration Approved by Diego. Originally committed as revision 6591 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make zero motion vector threshold user setableMichael Niedermayer2006-05-071-1/+2
| | | | Originally committed as revision 5348 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-121-1/+1
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: tabs --> spaces, some prettyprintingDiego Biurrun2005-12-221-5/+5
| | | | Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status