[FFmpeg-cvslog] Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 29 14:16:46 2012 +0100| [9f8e2e92ae88841709ae1ffe71572ef7e5e865c7] | committer: Michael Niedermayer

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

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