diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 12:40:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 12:41:09 +0100 |
| commit | 3ccda2b02ba643df35bf76988cfecba0c5034bb1 (patch) | |
| tree | e2c413f713d553319bea713930e5e86389a3af84 /libavformat/filmstripenc.c | |
| parent | 7ff1a4b10f2d7f9a4ae1c72e1259b4ed7d13e316 (diff) | |
| parent | 375ef6528c9dd2db7f9881e232cb0ec3aa16970d (diff) | |
| download | ffmpeg-3ccda2b02ba643df35bf76988cfecba0c5034bb1.tar.gz | |
Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'
* commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d':
libfdk-aacenc: Actually check for upper bounds of cutoff
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/filmstripenc.c')
0 files changed, 0 insertions, 0 deletions