aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-21 19:03:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-21 19:06:31 +0100
commitc8a0a2e990ba80fefe96c3aa6e9ed46bc6001e3a (patch)
tree321ade3e64fce959df1c005b57e0589ce99c9d43 /libswscale/Makefile
parenta486dec4fd8f2d461ebec5b2744844916c28d383 (diff)
parentd28fc7b29a728bd2f88c10121abbd0442c341746 (diff)
downloadffmpeg-c8a0a2e990ba80fefe96c3aa6e9ed46bc6001e3a.tar.gz
Merge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'
* commit 'd28fc7b29a728bd2f88c10121abbd0442c341746': avconv_filter: add new line after error message See: c790ae02654422f3fd8742c147f988e444ee3dd3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
0 files changed, 0 insertions, 0 deletions