Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Nov 2012 10:12:25 +0000 (11:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Nov 2012 10:12:25 +0000 (11:12 +0100)
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
  avformat: clarify stream id for muxing
  fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
  ppc: do not pass redundant compiler flags
  avutil: change GET_UTF8 to not use av_log2()
  segment: fix NULL pointer dereference in seg_write_header()

Conflicts:
tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/avformat.h
libavutil/common.h
tests/fate/aac.mak

diff --cc configure
Simple merge
Simple merge
Simple merge
@@@ -93,7 -81,7 +98,7 @@@ FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_A
  $(FATE_AAC_ALL): CMP  = oneoff
  $(FATE_AAC_ALL): FUZZ = 2
  
 -FATE_SAMPLES_AVCONV += $(FATE_AAC_ALL)
 +FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE)
  
 -fate-aac: $(FATE_AAC_ALL)
 +fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE)
- fate-aac-latm: $(FATE_AAC_LATM)
+ fate-aac-latm: $(FATE_AAC_LATM-yes)