• Michael Niedermayer's avatar
    Merge remote-tracking branch 'newdev/master' · 27ef7b1b
    Michael Niedermayer authored
    * newdev/master:
      mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
      Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
      Use audio_service_type to set stream disposition.
      Add APIchanges entry for audio_service_type.
      Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
      configure: in check_ld, place new -l flags before existing ones
      support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
      doc: update build system documentation
      aacenc: indentation
      aacenc: fix the side calculation in search_for_ms
      vp8.c: rename EDGE_* to VP8_EDGE_*.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavcodec/vp8.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    27ef7b1b
aac_ac3_parser.h 2.02 KB