Michael Niedermayer
d7e5aebae7
Merge remote branch 'qatar/master'
...
* 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>
2011-04-27 03:51:04 +02:00
Stefano Sabatini
bebe72f4a0
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
...
Also deprecate av_get_pict_type_char() in favor of
av_get_picture_type_char().
The new enum and av_get_picture_type_char() are defined in libavutil.
This allows the use in libavfilter without the need to link against
libavcodec.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-26 08:38:57 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Michael Niedermayer
e528cdac8a
Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
...
This reverts commit 29ba091136
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0cb88628fb
Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
...
This reverts commit a03be6e1ba
2011-03-17 17:26:45 +01:00
Janne Grunau
a03be6e1ba
use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*
2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136
replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
...
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
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
2010-04-20 14:45:34 +00:00
Stefano Sabatini
4160069067
Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
...
XXX_license() functions, consistent with the rest of FFmpeg.
Originally committed as revision 21005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-03 14:31:25 +00:00
Diego Biurrun
c173693698
Add functions to return library license and library configuration.
...
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-18 17:15:17 +00:00
Stefano Sabatini
76eb5c0523
Cosmetics: fix weird indent.
...
Originally committed as revision 14670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 19:50:35 +00:00
Stefano Sabatini
7f0026dded
Implement avutil_version().
...
Originally committed as revision 14665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 18:32:20 +00:00
