MPEG4Writer: allow both input format and stream to specify CSD
am: 7c9ea89

* commit '7c9ea89cbe3e42e0d94b1790ae1d424a9c16ce08':
  MPEG4Writer: allow both input format and stream to specify CSD