diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:31:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:31:50 +0200 |
| commit | f5c7531ab1e69210df69b07ac6b21cb675f13b9e (patch) | |
| tree | 9d8b27e3c8ab247a8097ee2919798f773cef58ba /libavformat/rtpdec_amr.c | |
| parent | 0187c2ccda3b00d22797170bf5675318dd0f675a (diff) | |
| parent | 7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161 (diff) | |
| download | ffmpeg-f5c7531ab1e69210df69b07ac6b21cb675f13b9e.tar.gz | |
Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
qsv: Skip header compilation depending on what parts of qsv are enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_amr.c')
0 files changed, 0 insertions, 0 deletions