diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 14:48:46 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 14:48:46 +0100 |
| commit | efcc8fddd6b7d1f931ff349e195d78c3c943d7fd (patch) | |
| tree | ecf3345aba5ded449157b77fea07c817f51a3a82 /libavcodec/Makefile | |
| parent | 079b5d4ef888bd42bf0147a6d964b8bc9ec0f3c5 (diff) | |
| parent | e02de9df4b218bd6e1e927b67fd4075741545688 (diff) | |
| download | ffmpeg-efcc8fddd6b7d1f931ff349e195d78c3c943d7fd.tar.gz | |
Merge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'
* commit 'e02de9df4b218bd6e1e927b67fd4075741545688':
lavc: export Dirac parsing API used by the ogg demuxer as public
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c169135020..44b199e248 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -7,6 +7,7 @@ HEADERS = avcodec.h \ avfft.h \ dv_profile.h \ d3d11va.h \ + dirac.h \ dxva2.h \ qsv.h \ vaapi.h \ @@ -26,6 +27,7 @@ OBJS = allcodecs.o \ bitstream_filter.o \ codec_desc.o \ d3d11va.o \ + dirac.o \ dv_profile.o \ imgconvert.o \ mathtables.o \ |