[FFmpeg-cvslog] Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 00:06:36 2014 +0200| [220bbc44c2cfc9c291b16b9fdd6ee70d27298d8b] | committer: Michael Niedermayer

Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2

* commit '6672f672d98cf4887e13321b6f67682cfd1273b4':
  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=220bbc44c2cfc9c291b16b9fdd6ee70d27298d8b
---