Changeset 34465bb in ffmpeg

Timestamp:

Nov 20, 2011, 2:43:19 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bdd22e35

Parents:

a9011623 (diff), 7a9807d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)