[FFmpeg-cvslog] Merge commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 01:00:59 2014 +0200| [45283653a30e33a8ef0e35f2f6f502de2f93ce22] | committer: Michael Niedermayer

Merge commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0' into release/1.1

* commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0':
  avconv: make -shortest work with streamcopy

Conflicts:
	ffmpeg.c

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

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