aboutsummaryrefslogtreecommitdiffstats
path: root/presets
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-10 02:21:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-10 02:21:04 +0100
commit07ab8d3369b2fee9d3871a5f65313be5d9fe5c89 (patch)
treea8f582910c0e612f0974118bc1d28cd57e567115 /presets
parentf0a5f71074d914dde1585f12ae5101bd639b83e1 (diff)
parent3f78f0904bfa012b171cecfae87af7c6909c8ede (diff)
downloadffmpeg-07ab8d3369b2fee9d3871a5f65313be5d9fe5c89.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Revert "build: disable iconv by default." Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions