Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 May 2011 03:00:01 +0000 (05:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 May 2011 03:32:03 +0000 (05:32 +0200)
commit6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a
tree892dbfcfc54c4acdfe9619fdb597eb741c6abae6
parent840238b8706ea2ca740cf4b49bffd8ae196352f9
parenta1d0dcc7134f1401c682b5e13d4ab3864da21efb
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: make executable again
  LATM/AAC: Free previously initialized context on reinit.
  configure: Do not unconditionally add -Wall to host CFLAGS.
  configure: Set OS/2 objformat to a.out.
  Add support for a.out object format to assembler macros.
  fate: disable threading for encoding
  fate: add comment field
  fate: allow overriding default build and install dirs
  mpegtsenc: Add an AVClass pointer to the private data
  mpegaudio: clean up #includes
  mpegaudio: move all header parsing to mpegaudiodecheader.[ch]

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
configure
libavcodec/aacdec.c
libavcodec/mp3_header_compress_bsf.c
libavcodec/mp3_header_decompress_bsf.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio_parser.c
libavcodec/mpegaudiodata.h
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodecheader.c
libavcodec/mpegaudiodecheader.h
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavformat/mp3enc.c
libavformat/mpegtsenc.c