diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 21:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 21:19:41 +0200 |
| commit | b286383bd2b13fdf59aecdb23d8514323460483b (patch) | |
| tree | 4f8ee9745d719e2918843d0d8ebcf053ac220ef4 /libavutil | |
| parent | 7c84e7d33762a4bccc0002476a3b20e0b8f26fcc (diff) | |
| parent | 5e745cefc0f89cf698c4cf0104182472fe0f603e (diff) | |
| download | ffmpeg-b286383bd2b13fdf59aecdb23d8514323460483b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: read attached pictures.
apetag: reindent
apetag: export attached covers as video streams.
apetag: fix the amount of data read from binary tags.
apetag: make sure avio_get_str() doesn't read more than it should.
mov: read itunes cover art.
snow: remove VLA in mc_block()
intfloat: Don't use designated initializers in the public headers
snow: remove a VLA.
doc: Remind devs to check return values, especially for malloc() et al
MS ATC Screen (aka MSS3) decoder
vf_yadif: move x86 init code to x86/yadif.c
vf_gradfun: move x86 init code to x86/gradfun.c
roqvideo: Remove a totally unused dspcontext
smacker: remove some unused code
dsicin: remove dead assignment
aacdec: remove dead assignment
rl2: remove dead assignment
proresenc: make a variable local to the loop where it is used
alsdec: remove dead assignments
Conflicts:
Changelog
doc/developer.texi
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavfilter/gradfun.h
libavfilter/x86/gradfun.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/intfloat.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavutil/intfloat.h b/libavutil/intfloat.h index 9db624a6ce..38d26ad87e 100644 --- a/libavutil/intfloat.h +++ b/libavutil/intfloat.h @@ -39,7 +39,8 @@ union av_intfloat64 { */ static av_always_inline float av_int2float(uint32_t i) { - union av_intfloat32 v = { .i = i }; + union av_intfloat32 v; + v.i = i; return v.f; } @@ -48,7 +49,8 @@ static av_always_inline float av_int2float(uint32_t i) */ static av_always_inline uint32_t av_float2int(float f) { - union av_intfloat32 v = { .f = f }; + union av_intfloat32 v; + v.f = f; return v.i; } @@ -57,7 +59,8 @@ static av_always_inline uint32_t av_float2int(float f) */ static av_always_inline double av_int2double(uint64_t i) { - union av_intfloat64 v = { .i = i }; + union av_intfloat64 v; + v.i = i; return v.f; } @@ -66,7 +69,8 @@ static av_always_inline double av_int2double(uint64_t i) */ static av_always_inline uint64_t av_double2int(double f) { - union av_intfloat64 v = { .f = f }; + union av_intfloat64 v; + v.f = f; return v.i; } |