• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ba57ef29
    Michael Niedermayer authored
    * qatar/master:
      avconv: Fix spelling errors.
      aac: Only set sample rate and object type from ADTS if output hasn't been configured.
      aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
      aac: Only output configure if audio was found.
      avconv: save two levels of indentation in flush_encoders()
      avconv: factor flushing encoders out of output_packet().
      avconv: factor out initializing input streams.
      avconv: remove -intra option.
      avconv: reset streamid_map between output files.
      avconv: make timer_start a local var in transcode().
      avconv: cosmetics, move OutputStream.
      avconv: remove two unused macros.
    
    Conflicts:
    	avconv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ba57ef29
aacdec.c 91 KB