[FFmpeg-cvslog] Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 00:16:34 2014 +0200| [9a2850c26af8fbf4766fd6d6795c6687eab44bbc] | committer: Michael Niedermayer

Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'

* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11':
  output example: store the scaling context in the stream context

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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