diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 21:20:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 21:20:40 +0200 |
commit | ff0631ab058bd7a8cb7f5cc4585ac27e12c6fb6d (patch) | |
tree | 46adfa676b96c7676e156f37394fe405cf9cf7b1 /doc/ffprobe.texi | |
parent | c600c8e966996555724d574e26f9e95259b1f884 (diff) | |
parent | 180e6b48060f97fdd8497320395b61dc85664ecd (diff) | |
download | ffmpeg-ff0631ab058bd7a8cb7f5cc4585ac27e12c6fb6d.tar.gz |
Merge commit '180e6b48060f97fdd8497320395b61dc85664ecd'
* commit '180e6b48060f97fdd8497320395b61dc85664ecd':
libx265: Actually use X265_API_IMPORTS
See: 4e9b46b0568196e9e1640350a3c6f5f09bfd9e47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.texi')
0 files changed, 0 insertions, 0 deletions