diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 01:20:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 01:20:24 +0200 |
commit | 02b5af7744059aecd580e5d7be60964695bd5a75 (patch) | |
tree | cb3125f36485bc83116cf27571fcf69b8670df3e /doc/examples/decoding_encoding.c | |
parent | 0ba65c9f795a1d3ad842f6d3179472e35c73541c (diff) | |
parent | 863ee06809b215895ee20cbc557eeceb904cf770 (diff) | |
download | ffmpeg-02b5af7744059aecd580e5d7be60964695bd5a75.tar.gz |
Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'
* commit '863ee06809b215895ee20cbc557eeceb904cf770':
configure: Use the right local variable in the MSVC and ICL probes
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions