diff options
| author | Michael Niedermayer <[email protected]> | 2011-04-12 03:43:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-04-12 03:48:21 +0200 |
| commit | 4727ec3c0e64b9144006abf82e080fb734ad4b0a (patch) | |
| tree | c00962593119265e5dcb70fd70a2a12f623fb559 /libavformat/timefilter.c | |
| parent | 13d4ec844a7e0e46da42c3ab152e5c3efe0897e3 (diff) | |
| parent | db46be01ecf44608932cfa33e8914a4c38b93431 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat/timefilter.c')
| -rw-r--r-- | libavformat/timefilter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/timefilter.c b/libavformat/timefilter.c index 4a582242ec..5c780c8d90 100644 --- a/libavformat/timefilter.c +++ b/libavformat/timefilter.c @@ -79,6 +79,8 @@ double ff_timefilter_update(TimeFilter *self, double system_time, double period) #include "libavutil/lfg.h" #define LFG_MAX ((1LL << 32) - 1) +#undef printf + int main(void) { AVLFG prng; |