Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Apr 2013 23:02:17 +0000 (01:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Apr 2013 23:02:21 +0000 (01:02 +0200)
* cigaes/master:
  ffmpeg: make -aspect work with -vcodec copy.
  lavfi/vf_aspect: improve compatibility of parsing.

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

Trivial merge