Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 02:17:16 +0000 (03:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 02:19:22 +0000 (03:19 +0100)
commit3adb5f8d8b4006f4188c9c4d6f0925988fadc2f4
tree5fcd6d5b8350b26839ccea85b7c0db5178f8dcc2
parent6a4cc50980783013b19bfb2edaaca14cc38d5c92
parentd9ae1031f5edbd25c8526b4cb51aba66d3bee931
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@gmx.at>
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h