diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-24 01:19:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-24 01:41:43 +0100 |
| commit | df825c956af76ae04af18dc00403bf1a0e745af1 (patch) | |
| tree | 45759720297eb50f0e8b0057c1b3217761eb2237 /libavformat/apc.c | |
| parent | d38580a7bb811028b5d3bac4924fd486c06b816f (diff) | |
| parent | d912a30c7d5cf9b8fdb26402804c9b0f999b4ff1 (diff) | |
| download | ffmpeg-df825c956af76ae04af18dc00403bf1a0e745af1.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
This merge is primary for metadata, theres little actually changed
except cosmetics
* qatar/release/0.7:
4xm: Add a check in decode_i_frame to prevent buffer overreads
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
Update RELEASE file for 0.7.3
swscale: #include "libavutil/mathematics.h"
vp3dec: Check coefficient index in vp3_dequant()
svq1dec: call avcodec_set_dimensions() after dimensions changed.
swscale: Readd #define _SVID_SOURCE
Conflicts:
RELEASE
libavcodec/4xm.c
libavcodec/vp3.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apc.c')
0 files changed, 0 insertions, 0 deletions