Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 09:45:25 +0000 (11:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 09:49:01 +0000 (11:49 +0200)
commit90e1fc8bec1ba9ba40bfcc2ce0993dac6260d3af
treebbd03fec6663d7dbe90bf4ee6fbdfdb072f96bb9
parent1e678007800ad9bd7332ea4f2250f5bcfac369ad
parent47b6cfc2a0333fb24f074d27830bf35ae5007050
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@gmx.at>
common.mak