* qatar/master:
swscale: remove misplaced comment.
ffmpeg: fix streaming to ffserver.
swscale: split out RGB48 output functions from yuv2packed[12X]_c().
build: move vpath directives to main Makefile
swscale: fix JPEG-range YUV scaling artifacts.
build: move ALLFFLIBS to a more logical place
ARM: factor some repetitive code into macros
Fix SVQ3 after adding 4:4:4 H.264 support
H.264: fix CODEC_FLAG_GRAY
4:4:4 H.264 decoding support
ac3enc: fix allocation of floating point samples.
Conflicts:
ffmpeg.c
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libswscale/swscale.c
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This target was added to prevent some files being deleted
by make when using chains of implicit rules. This is no
longer required.
Signed-off-by: Mans Rullgard <mans@mansr.com>
* 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>
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stripping is generally best left to package management tools, and
since unstripped copies are kept in the build tree, any arguments
about saving space (no matter how insignificant) are void.
Signed-off-by: Mans Rullgard <mans@mansr.com>
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>
We no longer create dependency files directly, so the rules are now pointless.
Originally committed as revision 24807 to svn://svn.ffmpeg.org/ffmpeg/trunk
The new library is meant to contain the core multimedia utilities for
FFmpeg, to make them shareable between more libav* libraries.
See thread:
Subject: [FFmpeg-devel] [RFC] New library for shared non-generic libav* utils
Date: Fri, 9 Jul 2010 01:07:40 +0200
Originally committed as revision 24393 to svn://svn.ffmpeg.org/ffmpeg/trunk
The presence of the .SECONDARY directive caused thing to not always
be correctly rebuilt. Mentioning the object files explicitly as
targets gives the desired result of make not deleting them without
unpleasant side-effects.
Originally committed as revision 22422 to svn://svn.ffmpeg.org/ffmpeg/trunk
Force version.sh to run whenever the version might have changed,
regardless of what is being built. This is done by attaching the
dependencies to a dummy file (.version) which is included from the
makefile. As make will always attempt to rebuild any included files
before considering other rules, this ensures that the real version.h
is (re-)created before it is required by any source file.
Originally committed as revision 22420 to svn://svn.ffmpeg.org/ffmpeg/trunk
Some of the per-arch headers are only meant to be used through
the parent header of the same name. Testing these standalone
does not make sense.
Originally committed as revision 22341 to svn://svn.ffmpeg.org/ffmpeg/trunk
This gives brief messages from make by default. For full command
echoing, add V=1 to make command line.
Originally committed as revision 22244 to svn://svn.ffmpeg.org/ffmpeg/trunk
Most of the make builtin rules, which we do not need, are suffix rules,
and we use only new-style pattern rules. Disabling suffix rules saves
some time when building on slow systems.
Originally committed as revision 22064 to svn://svn.ffmpeg.org/ffmpeg/trunk
This makes it easy to supply extra flags on the make command line
for testing purposes.
Originally committed as revision 21515 to svn://svn.ffmpeg.org/ffmpeg/trunk
