• Michael Niedermayer's avatar
    Merge commit 'e4d349b4' · 9f8e2e92
    Michael Niedermayer authored
    * commit 'e4d349b4':
      fate: h264: Add dependencies
      fate: ea: Add dependencies
      fate: Do not unconditionally run libavutil tests
      rtpenc_chain: Remove unused variable
      nuv: check for malloc failure when allocating extradata
      nuv: use the stream indices generated by avformat_new_stream()
    
    Conflicts:
    	tests/fate/ea.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9f8e2e92
ea.mak 1.07 KB