diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:47:25 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:47:40 +0100 |
| commit | af9cac1be1750ecc0e12c6788a3aeed1f1a778be (patch) | |
| tree | 2e34226dbd4010774f6ffef448aab4b7d4f88544 /libavcodec/Makefile | |
| parent | 6d160afab2fa8d3bfb216fee96d3537ffc9e86e8 (diff) | |
| parent | 33d18982fa03feb061c8f744a4f0a9175c1f63ab (diff) | |
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@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 ec4144631a..6a2450ed28 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -26,6 +26,8 @@ OBJS = allcodecs.o \ avpicture.o \ bitstream.o \ bitstream_filter.o \ + bitstream_filters.o \ + bsf.o \ codec_desc.o \ d3d11va.o \ dirac.o \ |