diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-17 04:47:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-17 04:51:33 +0200 |
| commit | f8ae3a2108b612776e886d927b4a7289dde619f1 (patch) | |
| tree | c10fc78e3c6340c9513f99faadf077ee6c7d2986 /libavcodec/mathops.h | |
| parent | e6e7ba0ce3aadef32f7f16f706c4a0406b5bd70f (diff) | |
| parent | 901ff51116f831c9082e14c80c7481dd3999aa30 (diff) | |
| download | ffmpeg-streaming-f8ae3a2108b612776e886d927b4a7289dde619f1.zip ffmpeg-streaming-f8ae3a2108b612776e886d927b4a7289dde619f1.tar.gz | |
Merge remote branch 'qatar/master'
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits
* qatar/master:
ffmpeg: fix -aspect cli option
Restructure video filter implementation in ffmpeg.c.
ffplay: remove audio_write_get_buf_size() forward declaration
lavfi: print key-frame and picture type information in ff_dlog_ref()
mathops: remove ancient confusing comment
cws2fws: Improve error message wording.
tools: Check the return value of write().
mpegaudio: move OUT_FMT macro to mpegaudiodec.c
mpegaudio: remove OUT_MIN/MAX macros
Add missing #includes to mp3_header_(de)compress bsf
dct: fix indentation
dct: bypass table allocation for DCT_II of size 32
h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
Remove unused header mpegaudio3.h.
Conflicts:
ffmpeg.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio3.h
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mathops.h')
| -rw-r--r-- | libavcodec/mathops.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 4d88ed1..29b3cd0 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -45,9 +45,6 @@ #endif #ifndef MULH -//gcc 3.4 creates an incredibly bloated mess out of this -//# define MULH(a,b) (((int64_t)(a) * (int64_t)(b))>>32) - static av_always_inline int MULH(int a, int b){ return ((int64_t)(a) * (int64_t)(b))>>32; } |
