• Michael Niedermayer's avatar
    Merge commit '3b4296f4' · 4d941eac
    Michael Niedermayer authored
    * commit '3b4296f4':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4d941eac
common.h 12.1 KB