diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 11:45:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 11:49:01 +0200 |
| commit | 90e1fc8bec1ba9ba40bfcc2ce0993dac6260d3af (patch) | |
| tree | bbd03fec6663d7dbe90bf4ee6fbdfdb072f96bb9 /cmdutils.c | |
| parent | 1e678007800ad9bd7332ea4f2250f5bcfac369ad (diff) | |
| parent | 47b6cfc2a0333fb24f074d27830bf35ae5007050 (diff) | |
| download | ffmpeg-90e1fc8bec1ba9ba40bfcc2ce0993dac6260d3af.tar.gz | |
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>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions