Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 09:57:10 +0000 (10:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 09:57:10 +0000 (10:57 +0100)
commit0bdc5db520ba9126776dd12b6734150ebcc7c559
tree006c75694466587e9fb5fc48486f3ac26339875b
parent2b14593148e0aef6f3ca76dcc3f9f2133a066b3d
parent95a449d3ce8e15522df47a80a8a4593ea5c2b1bb
Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'

* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
  movenc: Remove an outdated comment

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi
libavformat/movenc.c