diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-24 16:50:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-24 16:50:44 +0200 |
| commit | 183bbc2af1dcda27b56f9a64145dc20ea33ecbcd (patch) | |
| tree | ce79bd93e16b730a29e92d36d2c9baeed419ba8d /libavutil/aes.c | |
| parent | c508adb22366149222797669b27fa5cdaa52fa9d (diff) | |
| parent | ef21b3d38e61ba6730eb1d4573da65ca222b3619 (diff) | |
| download | ffmpeg-183bbc2af1dcda27b56f9a64145dc20ea33ecbcd.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Ignore xing number of frames if the file is larger than indicated.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions