Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 22:06:36 +0000 (00:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 22:06:36 +0000 (00:06 +0200)
commit220bbc44c2cfc9c291b16b9fdd6ee70d27298d8b
treefc78361cb83795d0e5a1ec43ea222f069ce7d5a6
parentf378636d90af664e162f75c295167078e3a97360
parent6672f672d98cf4887e13321b6f67682cfd1273b4
Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2

* commit '6672f672d98cf4887e13321b6f67682cfd1273b4':
  avconv: make -shortest work with streamcopy

Conflicts:
ffmpeg.c

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