aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 10:25:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 10:25:32 +0200
commit3fa72de82f04802e307085d3fce9eafea1d3dc46 (patch)
tree075119600cac0d5d61b710c51a1c669306cc291b /doc/ffmpeg.texi
parent84bc317019ba5c35355592df64d152f2cff76339 (diff)
parent56ee3f9de7b9f6090d599a27d33a392890a2f7b8 (diff)
downloadffmpeg-3fa72de82f04802e307085d3fce9eafea1d3dc46.tar.gz
Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
0 files changed, 0 insertions, 0 deletions