[FFmpeg-cvslog] Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 10:25:32 2013 +0200| [3fa72de82f04802e307085d3fce9eafea1d3dc46] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fa72de82f04802e307085d3fce9eafea1d3dc46
---