diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-10 02:15:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-10 02:15:54 +0200 |
| commit | 60c6959b6bf853d7e4c2728000b89b2f4682278a (patch) | |
| tree | 4c0b82f0d63db9ac2cb99dcf82f75bf449c68d26 /libavcodec/mss34dsp.c | |
| parent | 5985316fba3b886699cc7f237bf10466d113fd08 (diff) | |
| parent | 461b45efd04859b2672238bc8a6ecab9e9a14948 (diff) | |
| download | ffmpeg-60c6959b6bf853d7e4c2728000b89b2f4682278a.tar.gz | |
Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'
* commit '461b45efd04859b2672238bc8a6ecab9e9a14948':
lavc: Add nvenc.h to the skipheader
Conflicts:
libavcodec/Makefile
No change as there is no nvenc.h in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss34dsp.c')
0 files changed, 0 insertions, 0 deletions