[FFmpeg-cvslog] Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 11:45:25 2013 +0200| [90e1fc8bec1ba9ba40bfcc2ce0993dac6260d3af] | committer: Michael Niedermayer

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

* commit '47b6cfc2a0333fb24f074d27830bf35ae5007050':
  avformat/output-example: Declare link dependency on libswscale in the Makefile

Conflicts:
	libavformat/Makefile

Changes to libavformat/Makefile are not merged as our build system for the examples
is different.

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

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