| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Fate update by michael.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master:
ARM: enable UAL syntax in asm.S
v4l2: don't leak video standard string on error.
swscale: Remove disabled code.
avfilter: Surround function only used in debug mode by appropriate #ifdef.
vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
build: remove BUILD_ROOT variable
vp8: use av_clip_uintp2() where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master: (27 commits)
ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
ac3dsp: fix loop condition in ac3_update_bap_counts_c()
ARM: unbreak build
ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
ac3enc: split mantissa bit counting into a separate function.
ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
get_bits: add av_unused tag to cache variable
sws: replace all long with int.
ARM: aacdec: fix constraints on inline asm
ARM: remove unnecessary volatile from inline asm
ARM: add "cc" clobbers to inline asm where needed
ARM: improve FASTDIV asm
ac3enc: use LOCAL_ALIGNED macro
APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
lavu: add av_get_pix_fmt_name() convenience function
cmdutils: remove OPT_FUNC2
swscale: fix crash in bilinear scaling.
vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
webm: support stereo videos in matroska/webm muxer
...
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
doc/muxers.texi
ffmpeg.c
ffplay.c
libavcodec/ac3enc.c
libavcodec/ac3enc_float.c
libavcodec/avcodec.h
libavcodec/get_bits.h
libavcodec/libvpxenc.c
libavcodec/version.h
libavdevice/libdc1394.c
libavformat/matroskaenc.c
libavutil/avutil.h
libswscale/rgb2rgb.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master: (32 commits)
doc: create separate section for audio encoders
swscale: Remove orphaned, commented-out function declaration.
swscale: Eliminate rgb24toyv12_c() duplication.
Remove h263_msmpeg4 from MpegEncContext.
APIchanges: Fill in git hash for fps_probe_size (30315a8)
avformat: Add fpsprobesize as an AVOption.
avoptions: Return explicitly NAN or {0,0} if the option isn't found
rtmp: Reindent
rtmp: Don't try to do av_malloc(0)
tty: replace AVFormatParameters.sample_rate abuse with a private option.
Fix end time of last chapter in compute_chapters_end
ffmpeg: get rid of useless AVInputStream.nb_streams.
ffmpeg: simplify managing input files and streams
ffmpeg: purge redundant AVInputStream.index.
lavf: deprecate AVFormatParameters.channel.
libdc1394: add a private option for channel.
dv1394: add a private option for channel.
v4l2: reindent.
v4l2: add a private option for channel.
lavf: deprecate AVFormatParameters.standard.
...
Conflicts:
doc/APIchanges
doc/encoders.texi
ffmpeg.c
libavdevice/alsa-audio.h
libavformat/version.h
libavutil/opt.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master: (22 commits)
configure: enable memalign_hack automatically when needed
swscale: unbreak the build on non-x86 systems.
swscale: remove if(bitexact) branch from functions.
swscale: remove if(canMMX2BeUsed) conditional.
swscale: remove swScale_{c,MMX,MMX2} duplication.
swscale: use emms_c().
Move emms_c() from libavcodec to libavutil.
tiff: set palette in the context when specified in TIFF_PAL tag
rtsp: use strtoul to parse rtptime and seq values.
pgssubdec: fix incorrect colors.
dvdsubdec: fix incorrect colors.
ape: Allow demuxing of files with metadata tags.
swscale: remove dead macro WRITEBGR24OLD.
swscale: remove AMD3DNOW "optimizations".
swscale: remove duplicate code in ppc/ subdirectory.
swscale: remove duplicated x86/ functions.
swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.
vsrc_buffer.h: add file doxy
vsrc_buffer: tweak error message in init()
msmpeg4: reindent.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This will be cleaned up in the next merge
Authorship / merged commits:
commit f668afd4896ee65683619b6f165dda4cdd46766f
Author: Janne Grunau <janne-libav@jannau.net>
Date: Fri Apr 15 09:12:34 2011 +0200
swscale: fix "ISO C90 forbids mixed declarations and code" warning
only hit with --enable-runtime-cpudetect
commit 7f2ae5c7af374dfe254195a9375974a2ff9395a7
Author: Janne Grunau <janne-libav@jannau.net>
Date: Fri Apr 15 02:09:44 2011 +0200
swscale: fix compilation with --enable-runtime-cpudetect
commit b6cad3df822969b31bb93eaf677e52a72416bc97
Author: Janne Grunau <janne-libav@jannau.net>
Date: Fri Apr 15 00:31:04 2011 +0200
swscale: correct include path to fix ppc altivec build
commit 6216fc70b74e01a5272085329aa92f5ac797f9cf
Author: Luca Barbato <lu_zero@gentoo.org>
Date: Thu Apr 14 22:03:45 2011 +0200
swscale: simplify rgb2rgb templating
MMX is always built. Drop the ifdefs
commit 33a0421bbaa64f4e9c3d852b7f225ede8dad1388
Author: Josh Allmann <joshua.allmann@gmail.com>
Date: Wed Apr 13 20:57:32 2011 +0200
swscale: simplify initialization code
Simplify the fallthrough case when no accelerated functions
can be initialized.
commit 735bf1951171a1e0ee4292e84a1b1beac45dd0ab
Author: Josh Allmann <joshua.allmann@gmail.com>
Date: Wed Apr 13 20:57:31 2011 +0200
swscale: further cleanup swscale.c
Move x86-specific constants out of swscale.c
commit 86330b4c9258d5e583c0db033d1e68f46443307c
Author: Luca Barbato <lu_zero@gentoo.org>
Date: Wed Apr 13 20:57:30 2011 +0200
swscale: partially move the arch specific code left
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.
commit c0038328830d7b341c28d7c99b0236a33617fd21
Author: Luca Barbato <lu_zero@gentoo.org>
Date: Wed Apr 13 20:57:29 2011 +0200
swscale: move away x86 specific code from rgb2rgb
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.
Conflicts:
libswscale/rgb2rgb.c
libswscale/swscale_template.c
|
|/
|
|
| |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
| |
This macro has unconditionally used .p2align for a long time and
serves no useful purpose.
|
|
|
|
|
|
| |
Introduce and use COMPILE_TEMPLATE_* instead.
Originally committed as revision 32241 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 32222 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 32221 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 32190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 32155 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
| |
being able to compile it and deduplicate the code at the same time.
Originally committed as revision 30978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
| |
This is of course done with permissions from the authors. The only GPL
component left are MMX optimizations for YUV to RGB conversion.
Originally committed as revision 30965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
| |
libswscale.
Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 30253 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 29654 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
| |
- Place curly brackets in the same line as while/for/if/switch/else/do;
- Place curly brackets at column 0 in the next line starting a function.
Originally committed as revision 29523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
|
|
|
|
| |
- Use 4 spaces throughout for indentation;
- Fix inconsistent indentation;
- Indent function calls and declarations aligning arguments on multiple lines
to the column after the opening parentheses;
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".
Originally committed as revision 29522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 29482 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 29439 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 29189 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 29030 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 29029 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Date: Wed Mar 18 23:11:50 2009
New Revision: 28996
Log:
Fix libswscale compilation on non-x86, hopefully without breaking MinGW64 again.
This change was non optimal, correct would have been to revert the offending commits
if no time was available to find a clean fix.
Originally committed as revision 29003 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
|
|
| |
YUYV->YUV420P
YUYV->YUV422P
UYVY->YUV420P
UYVY->YUV422P
Originally committed as revision 28997 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 28996 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 28992 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
| |
alpha channel to 0xFF
Originally committed as revision 28808 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 28756 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 28358 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
| |
They are now always defined to either 0 or 1.
Originally committed as revision 28311 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
| |
It seems that binutils >= 2.18 just treat eax as rax but older versions fail.
Originally committed as revision 28136 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 27816 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Neither the asm() nor the __asm__() keyword is not part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).
Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 synta.
Originally committed as revision 27778 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
|
| |
These functions are never called by themselves, the alias
interleaveBytes is used instead.
Originally committed as revision 27735 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
|
|
| |
less than a Intel core, thus it won't come there w/out disabling all the optimizations)
Originally committed as revision 27722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 27720 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 27698 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 27527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 27518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|
|
|
|
| |
Originally committed as revision 27190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
|