diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:12:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:18:06 +0100 |
| commit | ed80427e0ef59e45681930810aeb821a87e80710 (patch) | |
| tree | c02bbca286252598910342d2506dad25eb580d17 /libavutil/cpu.c | |
| parent | b13cd2d86763cddd754bab204b0893d7bf7e123b (diff) | |
| parent | 0a7c4daf469d4ac447fb822fe78337f62f4c04e6 (diff) | |
| download | ffmpeg-ed80427e0ef59e45681930810aeb821a87e80710.tar.gz | |
Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'
* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
Conflicts:
libavformat/version.h
removial postponed as the wraper code is trivial
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
0 files changed, 0 insertions, 0 deletions