Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Apr 2013 23:49:08 +0000 (01:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Apr 2013 23:49:39 +0000 (01:49 +0200)
* cigaes/master:
  ffmpeg: use a rational for -aspect option.

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

diff --cc ffmpeg.c
Simple merge