Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:16:46 +0000 (14:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:16:46 +0000 (14:16 +0100)
commit9f8e2e92ae88841709ae1ffe71572ef7e5e865c7
treed7343c8a8eee0a42ae4c6bcc0ee6105ebacaa3d9
parent52066bdb300b3a2cdef48897d0c864410b259084
parente4d349b4014ee2a03f521027e0bd1ace4a9e60bd
Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'

* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
  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: Michael Niedermayer <michaelni@gmx.at>
libavformat/nuv.c
libavformat/rtpenc_chain.c
tests/Makefile
tests/fate/ea.mak
tests/fate/h264.mak
tests/fate/libavutil.mak