diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:49:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:49:51 +0100 |
| commit | 9ad8f55edaf20a73ebf42ad9f0398e96a1726690 (patch) | |
| tree | 655dc38d5590a7d68937cd1000144bf2a93b996d /libavformat/rtpdec_g726.c | |
| parent | 83f18410bdcf149b58fb669cda65b1cdcdebf695 (diff) | |
| parent | cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41 (diff) | |
| download | ffmpeg-9ad8f55edaf20a73ebf42ad9f0398e96a1726690.tar.gz | |
Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'
* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
qsv: Skip qsv.h compilation if qsv is not enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_g726.c')
0 files changed, 0 insertions, 0 deletions