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)
commit7254afdf1c60f2786ff1f2a89e090f6c016ab85d
tree7254e50defef2854a5793b5b16c10e56fbf308f6
parent020c287f5ee51f06fd662f4ab79cb22acc5da204
parentb1cc12d0e3aa9f800de1cd6ffa6a2c54e78b4e5d
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: make -aspect work with -vcodec copy.
  lavfi/vf_aspect: improve compatibility of parsing.

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