[FFmpeg-cvslog] Merge commit '538bf767373f176b6487e30181155e74b37cced6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 08:52:03 2013 +0200| [2ad28840b3fb90d9f000b676853846792e05bd68] | committer: Michael Niedermayer

Merge commit '538bf767373f176b6487e30181155e74b37cced6'

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

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

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

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