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)
commit4d941eac1655b21af33c6e4d52b7bfd7f9e5b990
tree54fb5dafa6b702dc50fe5bd3691ec44679acf055
parent62006b539ddda23594febf0fcb2f21c03de60457
parent3b4296f41473a5b39e84d7a49d480624c9c60040
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

* 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>
configure
libavformat/avformat.h
libavutil/common.h
tests/fate/aac.mak