summaryrefslogtreecommitdiff
path: root/libswscale
Commit message (Collapse)AuthorAge
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-19
| |
| * Bump major versions of all libraries.Anton Khirnov2011-04-18
| | | | | | | | | | | | They've accumulated enough new APIs and corresponding deprecated cruft. This breaks API and ABI.
| * swscale: fix "ISO C90 forbids mixed declarations and code" warningJanne Grunau2011-04-15
| | | | | | | | only hit with --enable-runtime-cpudetect
| * swscale: fix compilation with --enable-runtime-cpudetectJanne Grunau2011-04-15
| |
| * swscale: correct include path to fix ppc altivec buildJanne Grunau2011-04-15
| |
| * swscale: simplify rgb2rgb templatingLuca Barbato2011-04-14
| | | | | | | | MMX is always built. Drop the ifdefs
| * swscale: simplify initialization codeJosh Allmann2011-04-14
| | | | | | | | | | Simplify the fallthrough case when no accelerated functions can be initialized.
| * swscale: further cleanup swscale.cJosh Allmann2011-04-14
| | | | | | | | Move x86-specific constants out of swscale.c
| * swscale: partially move the arch specific code leftLuca Barbato2011-04-14
| | | | | | | | | | | | | | | | | | | | PPC and x86 code is split off from swscale_template.c. Lots of code is still duplicated and should be removed later. Again uniformize the init system to be more similar to the dsputil one. Unset h*scale_fast in the x86 init in order to make the output consistent with the previous status. Thanks to Josh for spotting it.
| * swscale: move away x86 specific code from rgb2rgbLuca Barbato2011-04-14
| | | | | | | | | | | | | | Keep only the plain C code in the main rgb2rgb.c and move the x86 specific optimizations to x86/rgb2rgb.c Change the initialization pattern a little so some of it can be factorized to behave more like dsputils.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate libvo-*: Fix up the long codec names libavcodec: Mark AVCodec->priv_class const swscale: Factorize FAST_BGR2YV12 definition. libvo-aacenc: Only produce extradata if the global header flag is set lavf: postpone removal of public metadata conversion API lavc: postpone removal of request_channels lavc: postpone removal of audioconvert and sample_fmt wrappers lavf: postpone removal of deprecated avio functions libopencore-amr: Cosmetics: Rewrap and align libopencore-amr, libvo-amrbwenc: Rename variables and functions libopencore-amr: Convert commented out debug logging into av_dlog libopencore-amr: Remove an unused state variable libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table libopencore-amr: Remove a useless local variable libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const libopencore-amr, libvo-amrwbenc: Return proper error codes in most places libopencore-amr: Don't print carriage returns in log messages ... Conflicts: doc/developer.texi libavcodec/avcodec.h libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Factorize FAST_BGR2YV12 definition.Luca Barbato2011-04-13
| | | | | | | | | | It is used only for x86 so it will eventually be moved with that code into the x86 arch subdirectory.
| * Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().Diego Biurrun2011-04-11
| | | | | | | | | | | | | | | | | | | | | | | | When HAVE_7REGS was not defined these functions had an empty body causing the following warnings during compilation. In file included from libswscale/x86/yuv2rgb_mmx.c:58: libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_rgb32_MMX’: libswscale/x86/yuv2rgb_template.c:412: warning: no return statement in function returning non-void libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_bgr32_MMX’: libswscale/x86/yuv2rgb_template.c:457: warning: no return statement in function returning non-void Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Add pixel formats for 9- and 10-bit yuv420p.Oskar Arvidsson2011-04-10
| | | | | | | | | | | | | | | | Also add support for these formats in libswscale. Needed for high bit depth h264 decoding. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: postpone sws_getContext removal until next major bump.Anton Khirnov2011-04-06
| | | | | | | | The replacement isn't ready yet.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | fix runtime-cpu-detect bug in swscaleDarren Horrocks2011-04-05
| | | | | | | | | | | | | | swscale doesnt ever actually do any runtime detection at all when runtime cpu detection is enabled, it simply passes whatever is passed to -sws_flags, which could be nothing at all making swscale default to the C implementation.
* | Fix yuvj420p scaling artefact, issue1108.Michael Niedermayer2011-04-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix typo from e3a84542.Michael Niedermayer2011-03-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SWSCALE: Increase maximim with from 5120 to 21504Frank Barchard2011-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heres a benchmark VOFW 5120 VOFW 21504 Note 10438.8 10344.2 timex ffmpeg -y -i tulip2.mp4 tulip2.yuv 25611.9 24256.9 timex ffmpeg -y -itulip2.mp4 -s 1272x724 tulip2.yuv 24485.7 26006.6 28573.1 24291.3 24069.1 26995.9 25684.95 25387.675 average This is on a Nehalem i7. Despite being a 500 frame, 720p video, the numbers fluctuate, so I took an average of 4 runs. Another reason I'd like this change is youtube accepts videos with higher resolutions than 5120. 16384 is vp8's maximum resolution, so that should keep us amused for a little longer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation failure with runtime cpudetect (Ticket #22)Michael Niedermayer2011-03-28
| |
* | libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementationPeter Ross2011-03-26
| |
* | Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"Michael Niedermayer2011-03-17
| | | | | | | | This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
* | Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"Michael Niedermayer2011-03-17
|/ | | | This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
* use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*Janne Grunau2011-03-16
|
* replace FFMPEG with LIBAV in FFMPEG_CONFIGURATIONJanne Grunau2011-03-16
| | | | also update the multiple inclusion guards in config.h|mak
* Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Fix MMX rgb24 to yuv conversion with gcc 4.6Mans Rullgard2011-02-13
| | | | | | | | | | | When built with gcc 4.6, the MMX rgb24 to yuv conversion gives wrong output. The compiler produces this warning: libswscale/swscale_template.c:1885:5: warning: use of memory input without lvalue in asm operand 4 is deprecated Changing the memory operand to a register makes it work. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Remove a few if (p) av_freep(&p) formsClément Bœsch2011-02-04
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace ASMALIGN() with .p2alignMans Rullgard2011-01-18
| | | | | This macro has unconditionally used .p2align for a long time and serves no useful purpose.
* consolidate .gitignore patters into a single fileJanne Grunau2011-01-18
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* convert svn:ignore properties to .gitignore filesJanne Grunau2011-01-17
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* colorspace-test: fix buildRamiro Polla2010-12-07
| | | | | | rgb32tobgr32() has been removed in favour of shuffle_bytes_2103() in r32190 Originally committed as revision 32676 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Store src/dstFormat after calling handle_jpegMartin Storsjö2010-10-29
| | | | | | | | | | | handle_jpeg may update the src/dstFormat variables, this makes sure the updated version is stored in the context. This fixes roundup issue 2302. Patch by Troot, all_crap_goes_here at hotmail Originally committed as revision 32562 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* 100l, fix sws_getCachedContext. It did not set the colorspace details,Reimar Döffinger2010-10-03
| | | | | | | but worse it did not set up destination dimensions, thus every user of it would necessarily fail. Originally committed as revision 32424 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Set default values for the scale context in sws_alloc_context().Stefano Sabatini2010-09-29
| | | | Originally committed as revision 32415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Set the default value of param0 and param1 to SWS_PARAM_DEFAULT.Stefano Sabatini2010-09-29
| | | | Originally committed as revision 32414 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Set valid default values for the srcw, srch, dstw, dsth options in theStefano Sabatini2010-09-29
| | | | | | | | scale context. Prevent pointless warnings when using av_opt_set_defaults() for setting the default values, as in a pending patch. Originally committed as revision 32413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Cosmetics: put "if (...)" and "av_log(...)" in the same line forStefano Sabatini2010-09-29
| | | | | | improving vertical alignment and readability. Originally committed as revision 32405 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Put if (...) av_log() in the same line, more compact and increaseStefano Sabatini2010-09-29
| | | | | | readibility. Originally committed as revision 32404 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Amend constraints for the src_format and dst_format options in theStefano Sabatini2010-09-29
| | | | | | SWScale context. Originally committed as revision 32403 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Cosmetics: fix braces placement.Stefano Sabatini2010-09-29
| | | | Originally committed as revision 32402 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Deprecate sws_getContext(), use sws_alloc_context() andStefano Sabatini2010-09-28
| | | | | | sws_init_context() instead. Originally committed as revision 32401 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Add documentation for the returned value of sws_init_context().Stefano Sabatini2010-09-28
| | | | Originally committed as revision 32400 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Bump minor version after the addition of sws_alloc_context() andStefano Sabatini2010-09-28
| | | | | | sws_init_context() of r32368. Originally committed as revision 32396 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* 100l fix if conditionBaptiste Coudurier2010-09-27
| | | | Originally committed as revision 32395 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* Y400A (gray alpha) input support in libswscaleBaptiste Coudurier2010-09-27
| | | | Originally committed as revision 32394 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
* swscale: clear SWS_CPU_CAPS_SSE2 in update_flags_cpu() missed in r32068Janne Grunau2010-09-27
| | | | Originally committed as revision 32393 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale