[FFmpeg-cvslog] Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 12 12:02:34 2014 +0200| [52ce6be86b6a4404ad5d7d92266ea6cbc103102f] | committer: Michael Niedermayer

Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'

* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
  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=52ce6be86b6a4404ad5d7d92266ea6cbc103102f
---