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
9d35fa520e
Add AVX FFT implementation.
...
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-04-26 18:25:24 +02:00
d4a50a2100
Merge remote-tracking branch 'newdev/master'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:33:28 +01:00
26f548bb59
fft: remove inline wrappers for function pointers
...
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 19:49:18 +00:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
e7e2df27f8
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69
2011-01-28 03:15:34 +01:00
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
0c1758f018
Return the amount of input data actually used in the qdm2 decoder,
...
allows playback of files where multiple qdm2 packets have been merged.
Originally committed as revision 25943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-13 17:54:00 +00:00
47d2ddca80
Fix qdm2 decoder packet handling to match the api
...
Originally committed as revision 25767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-19 06:52:30 +00:00
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
4c399dc82b
Fix undefined expressions that use multiple calls to get_bits().
...
Because the order of evaluation of subexpressions is undefined, two
get_bits() calls may not be part of the same expression.
See also r24902.
Originally committed as revision 24906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 16:10:25 +00:00
09f6a45dc2
Remove non-existing stray arguments from Doxygen function documentation.
...
Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:19:29 +00:00
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
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
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
062777b343
Allow hard-coding several QDM2 tables (about 32 kB size).
...
Originally committed as revision 22525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 19:30:25 +00:00
41ea18fb0d
Give RDFT types more meaningful names
...
Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 21:47:44 +00:00
1429224b04
Move FFT parts from dsputil.h to fft.h
...
Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:34:46 +00:00
84dc2d8afa
Remove DECLARE_ALIGNED_{8,16} macros
...
These macros are redundant. All uses are replaced with the generic
DECLARE_ALIGNED macro instead.
Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:24:59 +00:00
c67278098d
Move array specifiers outside DECLARE_ALIGNED() invocations
...
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 03:25:11 +00:00
9adcccde0c
mpegaudiodec, mpc and qdm2 all use the same mpa_synth window, so make
...
them use the same variable/global storage.
Saves 4 kB in .bss.
Originally committed as revision 20314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 17:21:02 +00:00
fbf4d03a7c
Indent
...
Originally committed as revision 18864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-17 10:31:16 +00:00
8d9f12657c
Switch from INIT_VLC_USE_STATIC to INIT_VLC_USE_NEW_STATIC in qdm2.
...
Originally committed as revision 18863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-17 10:29:40 +00:00
6c73a7d06c
Remove redundant code, found by CSA
...
Originally committed as revision 18661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 13:52:33 +00:00
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
5ef251e504
Add missing av_cold in static init/close functions.
...
Patch by Daniel Verkamp daniel at drv dot nu.
Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 13:48:55 +00:00
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
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
2009-02-01 02:00:19 +00:00
63cae55d62
Use the new RDFT code in the QDM2 decoder.
...
Originally committed as revision 16865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-30 20:33:29 +00:00
ad1eebe360
Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.
...
Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 00:48:17 +00:00
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
fd76c37fd9
Modify all codecs to report their supported input and output sample format(s).
...
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00
d11f9e1b15
Prevent the qdm2 code from overreading/overflowing. Fixes Coverity ID 112 run 2
...
Originally committed as revision 14309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 18:53:04 +00:00
f7dbf86d93
Fix for possible null pointer dereferencing, closes Coverity report 68 run 2.
...
Originally committed as revision 14305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 15:48:53 +00:00
5bfe3b853a
minor simplification of qdm2_decode_fft_packets()
...
Originally committed as revision 14284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 21:16:59 +00:00
cf2baeb338
mark read-only data as const
...
Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 20:01:31 +00:00
fe4bf37455
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
...
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
f4433de9ef
consistency cosmetics: indices --> indexes
...
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:14:25 +00:00
162d4fc99d
Add long names to AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 22:39:51 +00:00
5e53486545
typo fix: inited --> initialized
...
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +00:00
0942f55cdc
const
...
Originally committed as revision 11767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:37:24 +00:00
621d7fe936
Rename two structures, identifiers starting with _[A-Z] are reserved.
...
Originally committed as revision 11435 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06 16:02:55 +00:00
e5a389a1b7
license header consistency cosmetics
...
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
c6bcbb2cd3
Use DECLARE_ALIGNED to ease porting
...
Originally committed as revision 9031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-15 20:47:55 +00:00
fead30d444
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
...
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
b78e7197a8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
...
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
63d6a6b91e
Fixed a possible bug, checked against the assembly.
...
No sample that used the code has been found though.
Originally committed as revision 5448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-02 07:50:12 +00:00
3bbe7f5d6b
10000l don't reuse outer loop index in inner loops
...
Originally committed as revision 5423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-29 19:25:46 +00:00
d00bff20b2
fix infinite loop
...
Originally committed as revision 5102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 21:47:53 +00:00
efce1a8fea
add static keyword to some functions
...
patch by Dieter <freebsd at sopwith solgatos com>
Originally committed as revision 4914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-30 23:41:27 +00:00
Michael Niedermayer
Vitor Sessak
Mans Rullgard
Diego Elio Pettenò
Reimar Döffinger
Baptiste Coudurier
Stefano Sabatini
Alex Converse
Diego Biurrun
Benjamin Larsson
Thilo Borgmann
Daniel Verkamp
Aurelien Jacobs
Peter Ross
Stefan Gehrer
Alex Beregszaszi
Roberto Togni
Dieter