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
e16665bf72
Merge remote branch 'qatar/master'
...
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-23 01:09:43 +02:00
d9dee728b8
Use av_log_ask_for_sample() to request samples from users.
2011-04-22 20:12:39 +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
ee7fed27d4
Rename sf_table in atrac.c unit to ff_atrac_sf_table.
...
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 82e1f217f2
2011-01-26 03:43:29 +01:00
82e1f217f2
Rename sf_table in atrac.c unit to ff_atrac_sf_table.
...
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 23:43:41 +00:00
015f9f1ad3
Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6eabb0d3ad
2011-01-23 19:32:08 +01:00
6eabb0d3ad
Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-22 17:53:27 +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
46a76dec93
Fix handling of truncated files. Should fix random FATE breakages.
...
Originally committed as revision 24745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 07:17:01 +00:00
a28cccf6d6
Fix memory leak in ATRAC3 decoder
...
Originally committed as revision 24361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:08:54 +00:00
8fc0162ac4
Add av_ prefix to bswap macros
...
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
e6b22522c9
bswap: change ME to NE in macro names
...
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.
Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:09:01 +00:00
9a58234fea
Fix misspelled parameter names in Doxygen documentation.
...
This fixes one Doxygen warning each.
Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:49:29 +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
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
a79b4b75f7
Remove unused variable, fixes the warning:
...
libavcodec/atrac3.c:195: warning: unused variable ‘s’
Originally committed as revision 19932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 18:21:54 +00:00
01b2214758
Merge FFTContext and MDCTContext
...
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 17:30:20 +00:00
76ec34a5c3
Remove redundant code forgotten in the split
...
Originally committed as revision 19810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-10 18:39:57 +00:00
0e1baedec3
Split out common routines needed in the atrac1 decoder from atrac3.c to atrac.c.
...
Originally committed as revision 19796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-08 19:25:54 +00:00
7dd5568924
Indent
...
Originally committed as revision 18866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-17 16:13:03 +00:00
031b1cbeeb
Change from INIT_VLC_USE_STATIC to INIT_VLC_USE_NEW_STATIC in atrac3
...
Originally committed as revision 18865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-17 16:12:07 +00:00
7d485f165f
Support for getting (i)MDCT output multiplied by a constant scaling factor.
...
Scaling (i)MDCT output has no runtime overhead and can be used to improve
performance of audio codecs. All the changes are only needed in
'ff_mdct_init' function and slow down initialization a bit.
Originally committed as revision 18855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 14:17:08 +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
e05c8d0682
use intptr_t to cast pointers to int in codecs maintained by benjamin larsson
...
Originally committed as revision 18027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-17 20:47:31 +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
b37b13066d
atrac3dec: cosmetics: indentation
...
Originally committed as revision 15530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 21:17:33 +00:00
15ae1959d8
atrac3: ensure input frame is not overwritten (it is const)
...
this fixes the following warning:
atrac3.c:889: warning: assignment discards qualifiers from pointer target type
Originally committed as revision 15464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-29 22:22:46 +00:00
d46ac5bfde
mdct wrapper function to match fft
...
Originally committed as revision 14703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:38:30 +00:00
0a570e826d
remove mdct tmp buffer
...
Originally committed as revision 14702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:36:36 +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
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
17125bd9da
Sample tested and the code worked so the comment is removed
...
Originally committed as revision 13650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:46:38 +00:00
d311f8f3e3
Update copyright and text
...
Originally committed as revision 13239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 19:42:02 +00:00
9d278d8859
Fix decoding of 01-Untitled(1).oma, patch by Maxim Poliakovski
...
Originally committed as revision 13238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 19:16:28 +00:00
9d82d6cbba
Transform codec names into single words.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 07:11:59 +00:00
d5202e4fda
Add long names to many AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +00:00
8687f7679d
const
...
Originally committed as revision 11718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 03:54:08 +00:00
aee481cebe
use av_clip_int16() where it makes sense
...
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 22:48:55 +00:00
5fc32c275e
use get_bits1(..) instead get_bits(.., 1)
...
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 00:13:31 +00:00
Michael Niedermayer
Vitor Sessak
Diego Biurrun
Mans Rullgard
Diego Elio Pettenò
Justin Ruggles
Stefano Sabatini
Benjamin Larsson
Siarhei Siamashka
Thilo Borgmann
Ramiro Polla
Daniel Verkamp
Aurelien Jacobs
Loren Merritt
Peter Ross
Maxim Poliakovski
Alex Beregszaszi