[FFmpeg-cvslog] Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 15 11:12:25 2012 +0100| [4d941eac1655b21af33c6e4d52b7bfd7f9e5b990] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d941eac1655b21af33c6e4d52b7bfd7f9e5b990
---