Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 16:22:37 +0000 (18:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 16:22:41 +0000 (18:22 +0200)
commitfbc133915bb09d874fb9c1208f1441746294af2c
tree84e18354a8353dd1bddc95933a36e73d6f3304e2
parent3a76d7f73d495c5af0968e83d96c075c27af3b5c
parent5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow values >31bit for -analyzeduration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c