diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:29:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:29:15 +0100 |
| commit | ba8e909c825164a74a4fc580286200a9165e019c (patch) | |
| tree | 8593a7a5d08917fdef2dfdf3b6799d561bb2f8a9 | |
| parent | d69238e991844cb0e9407c26e64dd7a551aa5bab (diff) | |
| parent | 3193b13aa1e271f6d2dd68de67d448c08aef3c00 (diff) | |
| download | ffmpeg-ba8e909c825164a74a4fc580286200a9165e019c.tar.gz | |
Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
hlsenc: Allocate enough space for the pattern string
lavc: Correct the description of pkt_dts
avfilter: Compile FIFO filters unconditionally
Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavfilter/Makefile | 3 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 10 |
3 files changed, 10 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4c7ac2458f..11c50cacbf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1200,7 +1200,7 @@ typedef struct AVFrame { int64_t pkt_pts; /** - * dts from the last AVPacket that has been input into the decoder + * dts copied from the AVPacket that triggered returning this frame * - encoding: unused * - decoding: Read by user. */ diff --git a/libavfilter/Makefile b/libavfilter/Makefile index a5b5b31b92..4f0eb3b5c1 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -33,6 +33,7 @@ OBJS = allfilters.o \ buffersink.o \ buffersrc.o \ drawutils.o \ + fifo.o \ formats.o \ graphdump.o \ graphparser.o \ @@ -47,7 +48,6 @@ OBJS-$(CONFIG_AVFORMAT) += lavfutils.o OBJS-$(CONFIG_SWSCALE) += lswsutils.o OBJS-$(CONFIG_ACONVERT_FILTER) += af_aconvert.o -OBJS-$(CONFIG_AFIFO_FILTER) += fifo.o OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o OBJS-$(CONFIG_AMERGE_FILTER) += af_amerge.o OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o @@ -101,7 +101,6 @@ OBJS-$(CONFIG_EDGEDETECT_FILTER) += vf_edgedetect.o OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o OBJS-$(CONFIG_FIELD_FILTER) += vf_field.o OBJS-$(CONFIG_FIELDORDER_FILTER) += vf_fieldorder.o -OBJS-$(CONFIG_FIFO_FILTER) += fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_FRAMESTEP_FILTER) += vf_framestep.o OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index b842add1ee..88b097979c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -40,7 +40,6 @@ void avfilter_register_all(void) initialized = 1; REGISTER_FILTER (ACONVERT, aconvert, af); - REGISTER_FILTER (AFIFO, afifo, af); REGISTER_FILTER (AFORMAT, aformat, af); REGISTER_FILTER (AMERGE, amerge, af); REGISTER_FILTER (AMIX, amix, af); @@ -94,7 +93,6 @@ void avfilter_register_all(void) REGISTER_FILTER (FADE, fade, vf); REGISTER_FILTER (FIELD, field, vf); REGISTER_FILTER (FIELDORDER, fieldorder, vf); - REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); REGISTER_FILTER (FPS, fps, vf); REGISTER_FILTER (FRAMESTEP, framestep, vf); @@ -187,4 +185,12 @@ void avfilter_register_all(void) extern AVFilter avfilter_asink_abuffer; avfilter_register(&avfilter_asink_abuffer); } + { + extern AVFilter avfilter_af_afifo; + avfilter_register(&avfilter_af_afifo); + } + { + extern AVFilter avfilter_vf_fifo; + avfilter_register(&avfilter_vf_fifo); + } } |