[FFmpeg-cvslog] Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 11 02:13:46 2015 +0100| [2924514721bc32b500d6573899aed05cf6bbae67] | committer: Michael Niedermayer

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2924514721bc32b500d6573899aed05cf6bbae67
---