Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 19:37:05 +0000 (21:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 19:38:27 +0000 (21:38 +0200)
commit4b13ec69c6a23dd25d048bb129fadba131849cf9
tree623c673e25c0b0a6bcf617527deff7e7ae797b1a
parent714d9bd6ee2fff97ed14ccf1fc02f031afccce3c
parentc9c1265c52910578d3db1a6205c85b91ead0903f
Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'

* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
  avformat: update muxing doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h