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)
* 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:
1  2 
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

diff --cc configure
+++ b/configure
@@@ -2502,8 -2473,8 +2503,9 @@@ case $target_os i
          ranlib="echo ignoring ranlib"
          ;;
      os/2*)
 +        strip="lxlite -CS"
          ln_s="cp -f"
+         objformat="aout"
          add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
          SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
          FFSERVERLDFLAGS=""
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include "libavutil/avstring.h"
  #include "libavutil/intreadwrite.h"
  #include "libavutil/opt.h"
++#include "libavcodec/mpegaudio.h"
 +#include "libavcodec/mpegaudiodata.h"
 +#include "libavcodec/mpegaudiodecheader.h"
 +#include "libavformat/avio_internal.h"
  
  static int id3v1_set_string(AVFormatContext *s, const char *key,
                              uint8_t *buf, int buf_size)
Simple merge