Merge commit '538bf767373f176b6487e30181155e74b37cced6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:52:03 +0000 (08:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:52:03 +0000 (08:52 +0200)
commit2ad28840b3fb90d9f000b676853846792e05bd68
treef5d699cf49be342fdb1f5f07dba5750a9a6e7f87
parent91db8ff203048e3d6fed589e8352d3a5407d4302
parent538bf767373f176b6487e30181155e74b37cced6
Merge commit '538bf767373f176b6487e30181155e74b37cced6'

* commit '538bf767373f176b6487e30181155e74b37cced6':
  avconv: make -aspect work with streamcopy

Conflicts:
ffmpeg.c
ffmpeg_opt.c

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