diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 18:22:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 18:22:41 +0200 |
| commit | fbc133915bb09d874fb9c1208f1441746294af2c (patch) | |
| tree | 84e18354a8353dd1bddc95933a36e73d6f3304e2 /libavcodec/gsmdec.c | |
| parent | 3a76d7f73d495c5af0968e83d96c075c27af3b5c (diff) | |
| parent | 5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e (diff) | |
| download | ffmpeg-fbc133915bb09d874fb9c1208f1441746294af2c.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow values >31bit for -analyzeduration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec.c')
0 files changed, 0 insertions, 0 deletions