diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 17:18:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 17:18:59 +0200 |
commit | 988910a277f139aaf79389a0c730d3feb6f585e6 (patch) | |
tree | 70aa259ebaf39fdfaf8bec251737294d7f5ffcb5 /libavutil/log.h | |
parent | d6a55ab016f0b2c8504ec9fe2387ac6c0ef55dfd (diff) | |
parent | 6365b43295a0be1fc1ca67dd4a4d7c510daee79f (diff) | |
download | ffmpeg-988910a277f139aaf79389a0c730d3feb6f585e6.tar.gz |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
svq3: replace unsafe pointer casting with intreadwrite macros
Update Changelog for the 0.8.4 Release
lavc: remove stats_out from the options table.
Prepare for 0.8.4 Release
tiffenc: Check av_malloc() results.
mpegaudiodec: fix short_start calculation
h264: avoid stuck buffer pointer in decode_nal_units
vf_pad/scale: use double precision for aspect ratios.
yuv4mpeg: return proper error codes.
smacker audio: sign-extend the initial 16-bit predicted value
Conflicts:
Changelog
RELEASE
libavfilter/vf_pad.c
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.h')
0 files changed, 0 insertions, 0 deletions