[FFmpeg-cvslog] Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 03:17:16 2014 +0100| [3adb5f8d8b4006f4188c9c4d6f0925988fadc2f4] | committer: Michael Niedermayer

Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'

* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
  lavf: improve handling of sparse streams when muxing

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 37ed5df5c5e06a55724fb9eb215da1594b648282
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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