aboutsummaryrefslogtreecommitdiffstats
path: root/presets/libvpx-1080p50_60.ffpreset
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-30 20:58:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-30 20:58:25 +0200
commitfed28fe054de573643ae3fee50ad7ae09d78e738 (patch)
treea42426ab1847e82e7ed379c9f5aa99e96412add2 /presets/libvpx-1080p50_60.ffpreset
parent0a6d39791165e46c53c34793261378ef38442272 (diff)
parent8d7839fc7c52574dfc22db0181b1cef9cb929910 (diff)
downloadffmpeg-fed28fe054de573643ae3fee50ad7ae09d78e738.tar.gz
Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1
* commit '8d7839fc7c52574dfc22db0181b1cef9cb929910': avconv: fix the muxrate values for -target Conflicts: ffmpeg_opt.c No change, as ffmpegs muxrate is in bits/sec Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-1080p50_60.ffpreset')
0 files changed, 0 insertions, 0 deletions