• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7db7eb08
    Michael Niedermayer authored
    * qatar/master:
      Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
      avconv: move audio_channels to the options context.
      avconv: move *_disable to options context.
      avconv: remove -[vas]lang options.
      avconv: move codec tags to options context.
      cljr: init_get_bits size in bits instead of bytes
      indeo2: fail if input buffer too small
      indeo2: init_get_bits size in bits instead of bytes
      ffv1: Fixed size given to init_get_bits() in decoder.
    
    Conflicts:
    	avconv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7db7eb08
cljr.c 4.35 KB