* commit '9deaec78':
  lavf: move internal fields from public to internal context

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