Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 08:25:32 +0000 (10:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 08:25:32 +0000 (10:25 +0200)
commit3fa72de82f04802e307085d3fce9eafea1d3dc46
tree075119600cac0d5d61b710c51a1c669306cc291b
parent84bc317019ba5c35355592df64d152f2cff76339
parent56ee3f9de7b9f6090d599a27d33a392890a2f7b8
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>
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c