diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-07 22:42:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-07 22:51:34 +0200 |
| commit | 653d117c29123d353ce3bdd7de71e830a26733c1 (patch) | |
| tree | 996ad2bd13c774dc3265cbf0d8ae406372d57307 /libavfilter/Makefile | |
| parent | cb982739fa2b43afb7f1262c07804cad41f778de (diff) | |
| parent | fdc918632f5c16cf377a2170cd2f101933fb15ff (diff) | |
| download | ffmpeg-653d117c29123d353ce3bdd7de71e830a26733c1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libschroedinger: Switch to function names more in line with Libav style.
Move code shared between libdirac and libschroedinger to libschroedinger.
lavfi: uninline avfilter_copy_buffer_ref_props().
lavf: add missing '*' in a doxy.
h264: Remove a commented-out function pointer typedef.
txd: Remove write-only variable in txd_decode_frame().
mmvideo.c: Remove unused variable in mm_decode_pal().
build: cosmetics: Add missing end-of-line backslashes to item lists.
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
libschroedinger: Move a function to avoid a forward declaration.
pthread: warn on high thread counts
vf_yadif: fix missing error handling for avfilter_poll_frame()
avprobe: allow showing only one container/stream property.
lavfi: support audio in avfilter_copy_frame_props().
lavfi: avfilter_merge_formats: handle case where inputs are same
lavc: add sample rate and channel layout to AVFrame.
zerocodec: check if the previous frame is missing
doc: clarify check for NULL pointer style
Conflicts:
doc/APIchanges
doc/developer.texi
ffprobe.c
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/libdirac_libschro.c
libavcodec/libdirac_libschro.h
libavcodec/mmvideo.c
libavcodec/txd.c
libavcodec/version.h
libavcodec/zerocodec.c
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/version.h
libavformat/Makefile
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index e7ed1a5250..7da07eb76a 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -11,7 +11,14 @@ FFLIBS-$(CONFIG_PAN_FILTER) += swresample FFLIBS-$(CONFIG_REMOVELOGO_FILTER) += avformat avcodec FFLIBS-$(CONFIG_MP_FILTER) += avcodec postproc -HEADERS = asrc_abuffer.h avcodec.h avfilter.h avfiltergraph.h buffersink.h buffersrc.h version.h vsrc_buffer.h +HEADERS = asrc_abuffer.h \ + avcodec.h \ + avfilter.h \ + avfiltergraph.h \ + buffersink.h \ + buffersrc.h \ + version.h \ + vsrc_buffer.h \ OBJS = allfilters.o \ avfilter.o \ @@ -171,4 +178,5 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o TESTPROGS = drawutils formats -TOOLS = graph2dot lavfi-showfiltfmts +TOOLS = graph2dot \ + lavfi-showfiltfmts \ |