1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

19 Commits

Author SHA1 Message Date
Michael Niedermayer
4727ec3c0e Merge remote branch 'qatar/master'
* qatar/master:
Not pulled due to wrong author, according to carl:  Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
  Fix compilation of timefilter test program.
  Add support for AMR-WB encoding via libvo-amrwbenc
  Add an AAC encoder by using the libvo-aacenc library
  g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-12 03:48:21 +02:00
Diego Biurrun
70ad9842a5 Fix compilation of timefilter test program.
The printf function is forbidden in library code, but not in test programs,
so #undefine the printf macro that disables the system printf function.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-04-11 14:18:48 +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
Diego Biurrun
cc7b62afd2 Replace rand() usage by av_lfg_get().
Originally committed as revision 18420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 17:12:36 +00:00
Diego Biurrun
a2085cccfa cosmetics: Align output columns.
Originally committed as revision 18419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 15:16:11 +00:00
Michael Niedermayer
8507bde0f3 Add my name to copyright & author as requested by the original author.
Originally committed as revision 17858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 20:51:50 +00:00
Michael Niedermayer
8b2fa9659a Add code to the self test to print jitter & drift.
Originally committed as revision 17857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 20:48:31 +00:00
Diego Biurrun
e0c98063e7 Add '#undef rand' to fix test program build.
Originally committed as revision 17850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:57:26 +00:00
Diego Biurrun
6d16718e5d cosmetics: Fix test program warnings.
Originally committed as revision 17849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:55:50 +00:00
Michael Niedermayer
bc3057f499 Vertical align.
Originally committed as revision 17847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:48:02 +00:00
Michael Niedermayer
2e51dedd24 Better name for integrator2_state.
Originally committed as revision 17846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:47:16 +00:00
Michael Niedermayer
3228491027 Add clock_period parameter, this should make the code easier to use.
Originally committed as revision 17845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:44:12 +00:00
Michael Niedermayer
1b85ec1ea2 Selftest code.
Originally committed as revision 17844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:26:51 +00:00
Michael Niedermayer
8537591abc Fix bug with time==0 being special.
Originally committed as revision 17843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:23:52 +00:00
Michael Niedermayer
494065ca36 Adapt first factor.
Originally committed as revision 17842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:20:55 +00:00
Michael Niedermayer
55b5859867 Merge ff_timefilter_read() and ff_timefilter_update(), this simplifies API and
avoids calling them in the wrong order.

Originally committed as revision 17841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:14:44 +00:00
Michael Niedermayer
08ffd3708b Allow timespans to vary.
No change in performance if they do not vary.

Originally committed as revision 17840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:09:14 +00:00
Michael Niedermayer
28e947e458 Reorder operations, 20% improved performance, 1 variable less.
Originally committed as revision 17839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 23:57:42 +00:00
Michael Niedermayer
f982c6d87a Timefilter code by Olivier Guilyardi o list O samalyse o com
Originally committed as revision 17838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 23:45:18 +00:00