diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:25:25 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:26:17 +0200 |
commit | 037b44a3b44ead1cef8910c52fdd1343779b5203 (patch) | |
tree | 7ea63198858ef5c7ec085c4341f2f97edb5767f5 /libavcodec/Makefile | |
parent | d59bfcd11229300182c672ca734568919a85f773 (diff) | |
parent | 00332e0a064dad866812de9162b009cbaba6f5df (diff) | |
download | ffmpeg-037b44a3b44ead1cef8910c52fdd1343779b5203.tar.gz |
Merge commit '00332e0a064dad866812de9162b009cbaba6f5df'
* commit '00332e0a064dad866812de9162b009cbaba6f5df':
wrapped_avframe: Initial implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b8bd89530b..8f7493eb04 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -570,6 +570,7 @@ OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o +OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o OBJS-$(CONFIG_XAN_WC4_DECODER) += xxan.o |