diff options
| author | Clément Bœsch <u@pkh.me> | 2017-05-03 12:51:48 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-05-03 16:49:12 +0200 |
| commit | 3f17751eeb7e3348576e2597884d5e5155aadcfb (patch) | |
| tree | 63d0f773c095f4293f6b35c317df964c6d0f69d5 /libavdevice/Makefile | |
| parent | c3e08544100cdd7045f710bfcea33e07d9fcd25b (diff) | |
| parent | 11a9320de54759340531177c9f2b1e31e6112cc2 (diff) | |
| download | ffmpeg-streaming-3f17751eeb7e3348576e2597884d5e5155aadcfb.zip ffmpeg-streaming-3f17751eeb7e3348576e2597884d5e5155aadcfb.tar.gz | |
Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
build: Move build-system-related helper files to a separate subdirectory
"ffbuild" directory name is used instead of "avbuild".
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavdevice/Makefile')
| -rw-r--r-- | libavdevice/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 6139f19..fb7623f 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -1,4 +1,4 @@ -include $(SUBDIR)../config.mak +include $(SUBDIR)../ffbuild/config.mak NAME = avdevice |
