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 /libavfilter/allfilters.c | |
| parent | d69238e991844cb0e9407c26e64dd7a551aa5bab (diff) | |
| parent | 3193b13aa1e271f6d2dd68de67d448c08aef3c00 (diff) | |
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>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 10 |
1 files changed, 8 insertions, 2 deletions
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); + } } |