* commit '33c859c1':
  lavf: ignore attachment streams for interleaving purposes

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