diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 14:19:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 14:19:04 +0100 |
| commit | 77c235206a1b898155c9dd7ebf6ca608e295180b (patch) | |
| tree | 281f314eda7404a095e76eaccad6210a98dfd791 /libswscale/libswscale.v | |
| parent | 817f8138cb3ef14cc6be1634d4ddd01b510c16e6 (diff) | |
| parent | 63848854256a024a19435e87d6bc76fffa65e81e (diff) | |
| download | ffmpeg-77c235206a1b898155c9dd7ebf6ca608e295180b.tar.gz | |
Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'
* commit '63848854256a024a19435e87d6bc76fffa65e81e':
qt-faststart: Check the ftello() return codes
Conflicts:
tools/qt-faststart.c
See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/libswscale.v')
0 files changed, 0 insertions, 0 deletions