Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 16:48:02 +0000 (17:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 16:48:07 +0000 (17:48 +0100)
commit0500623d5840cd148c85c65a70a42b3b91ffd8e1
treec333c5bb464236e896ac9db51493d6851c8772ac
parentad8d063f230c05f8b5efbd05cc5a9f51a2549dcf
parent2dc5980d61493e05ccb04271a685fe804d87b155
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/dualinput: fix shortest option.
  lavfi/vf_tile: use av_make_q.
  lavfi/avf_concat: use av_make_q.
  lavfi/af_amerge: use av_make_q.
  lavu/rational: add syntactic sugar.

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