[FFmpeg-cvslog] Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 12:35:48 2013 +0200| [b7fc2693c70fe72936e4ce124c802ac23857c476] | committer: Michael Niedermayer

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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