diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 15:43:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 15:43:19 +0100 |
commit | 34465bbcb470f63a3e545ecbec0bd5619a27509b (patch) | |
tree | 4b0c7d75e3394c43d529827e0c5a3ee839447072 /libavformat/os_support.c | |
parent | a9011623ea95f051f740bffd2d473f28fd1f250e (diff) | |
parent | 7a9807dea44463c6741474fa8609118cd5f53b75 (diff) | |
download | ffmpeg-34465bbcb470f63a3e545ecbec0bd5619a27509b.tar.gz |
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall: (24 commits)
Clean-up
dump_int_buffer() to dump samples from a buffer
Implement revert_cdlms()
Doxy for reset_codec()
Store transient state and position of transient area
Implement use_high_update_speed() and use_normal_update_speed()
Initialize num_logged_tiles and remove unnecessary codes
Log index for each line of output
Log tile size
Output decoded residues
Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()
Implement lms_update()
Implement lms_predict()
Implement reset_codec()
Add missing syntax elements to WmallDecodeCtx
Add .recent syntax element to cdlms struct
Implement clear_codec_buffers()
Add buffers to context necessary for reverting cdmls and mclms filter
Use avpriv_copy_bits() instead of ff_copy_bits()
Cosmetics
...
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/os_support.c')
0 files changed, 0 insertions, 0 deletions