« Previous | Next » 

Revision 27ef7b1b

ID27ef7b1bcd0577e3f5bdfc524b42b0548567be20
Parent 0bfe349d, eb81cf86
Child 3e2523db

Added by Michael Niedermayer over 9 years ago

Merge remote-tracking branch 'newdev/master'

  • 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: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted