« Previous | Next » 

Revision c3f5b811

IDc3f5b8112573245fc5056a49477749df4ed1d0ea
Parent 3862ebba, ad1862d6
Child 301183d9

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    ALPHA: Replace sized int_fast integer types with plain int/unsigned.
    Duplicate DPX image encoder
    Duplicate DPX decoder: read sample aspect ratio
    Duplciate DPX decoder: add buffer size checks.
    ac3enc: clip large coefficient values and negative exponents rather than using av_assert2().
    ac3enc: do not store a bandwidth code for each channel.
    ac3enc: remove bandwidth reduction as fallback for bit allocation failure.
    ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy()
    ac3enc: return error if frame+exponent bits are too large instead of using av_assert2().
    ac3enc: differentiate between current block and reference block in bit_alloc()
    ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes.
    ac3enc: simplify stereo rematrixing decision options
    Include both URLs: Update URL to fate samples

Conflicts:
Changelog
doc/fate.txt
libavcodec/ac3enc.c
libavcodec/dpxenc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted