virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
30,266 Commits 37 Branches 400 Tags 467 MiB
a138121bf1
Commit Graph

30 Commits

Author SHA1 Message Date
Michael Niedermayer
e5a85164b1 Merge remote branch 'qatar/master' 
* qatar/master:
  mov: fix composition timestamps on movie fragments.
  wmavoice: Use proper size in memeset().
 2011-05-07 04:14:09 +02:00
Alex Converse
869303bebd wmavoice: Use proper size in memeset(). 
sizeof(array_functrion_argument) gives the size of the pointer type not
the size of the array to which it points.
 2011-05-05 21:25:48 -07:00
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
Vitor Sessak
9d35fa520e Add AVX FFT implementation. 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-04-26 18:25:24 +02:00
Michael Niedermayer
2d2b5a1421 10l, commit that should have been stashed into the merge. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:59:00 +02:00
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master' 
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:43:54 +02:00
Diego Biurrun
6001dad6e2 Replace more FFmpeg references by Libav. 2011-04-17 19:31:49 +02:00
Michael Niedermayer
d4a50a2100 Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-21 03:33:28 +01:00
Mans Rullgard
0aded9484d Move dct and rdft definitions to separate files 
This leaves fft.h with only the core FFT and MDCT definitions
thus making it more managable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 17:15:33 +00:00
Mans Rullgard
4538729afe Move sine windows to a separate file 
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 13:25:19 +00:00
Mans Rullgard
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
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
Diego Elio Pettenò
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
Diego Elio Pettenò
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
Ronald S. Bultje
18f1add31c Fix typo. 
Originally committed as revision 26099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 22:48:13 +00:00
Stefano Sabatini
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
Ronald S. Bultje
af0a61cc40 Fix buffer overrun if idx is negative (it can be down to -23>>4), by prepending 
two padding zeroes before it. Should fix fate failures on openBSD and crashes
on MacOSX (that I cannot reproduce).

Originally committed as revision 24750 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 13:54:59 +00:00
Axel Holzinger
0b2c75cb68 Rename pow variable to pwr. 
Patch by Axel Holzinger <aholzinger gmx de>.

Originally committed as revision 24508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 13:52:49 +00:00
Diego Biurrun
862be470f3 Use correct length modifier for size comparison in printf expression, fixes: 
libavcodec/wmavoice.c:1906: warning: format `%lu' expects type `long unsigned int', but argument 5 has type `unsigned int'
approved by Ronald and Mans on IRC

Originally committed as revision 24218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-12 19:36:35 +00:00
Ronald S. Bultje
ad32966cf9 Fix two doxy warnings. 
Originally committed as revision 24109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-08 15:00:47 +00:00
Måns Rullgård
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
Eli Friedman
25fe863062 Silense one warning: 
"passing argument 1 of ‘av_memcpy_backptr’ from incompatible pointer type"

Patch by Eli Friedman, eli D friedman A gmail

Originally committed as revision 23895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 01:57:05 +00:00
Ronald S. Bultje
1302ccc1a7 Another buffer overflow, fixes issue1758. 
Originally committed as revision 23011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-02 21:52:25 +00:00
Ronald S. Bultje
593a861470 Fix buffer overrun (or, well, actually a typo, 80 should be 0x80...). 
Partially fixes issue 1758.

Originally committed as revision 23005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 18:45:02 +00:00
Ronald S. Bultje
9a32573b49 WMAVoice postfilter. 
Originally committed as revision 22938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 18:01:34 +00:00
Ronald S. Bultje
b1078e9fe6 Move clipping of audio samples (for those codecs outputting float) from decoder 
to the audio conversion routines.

Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:57:48 +00: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
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
Benoit Fouet
32e543f866 Replace @returns by @return. 
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 15:50:57 +00:00
Ronald S. Bultje
fa65584f12 WMAVoice decoder. 
Originally committed as revision 21770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 14:22:41 +00:00