diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 03:37:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 04:26:42 +0100 |
| commit | 76477c3843c2f4ecbbd5d3e7bb3c407e575c6ef3 (patch) | |
| tree | eb5597b5e8deb1ae0373fb8e5271189ccdd005b7 /tools/enum_options.c | |
| parent | ccc4219558580cb96b448ad9b1410c09b488a1b8 (diff) | |
| parent | 72eca26bf95dd58ce05b9dbf9b1b3694f496daf6 (diff) | |
| download | ffmpeg-76477c3843c2f4ecbbd5d3e7bb3c407e575c6ef3.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
libx264: use the library specific default rc_initial_buffer_occupancy
lavc: set the default rc_initial_buffer_occupancy
lavc: introduce the convenience function init_get_bits8
lavc: check for overflow in init_get_bits
APIchanges: Fill in missing hashes and dates; fix a version number typo.
configure: enable pic for shared libs on AArch64
zmbv: Reset the decoder on keyframe errors
vc1dec: prevent a crash due missing pred_flag parameter
matroska: Fix use after free
vp3: Fix double free in vp3_decode_end()
update Changelog
oggdec: make sure the private parse data is cleaned up
oggdec: free the ogg streams on read_header failure
update Changelog
x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
Prepare 9.1 Release
Conflicts:
Changelog
RELEASE
doc/APIchanges
libavcodec/utils.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions