eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '3193b13aa1'

Browse source 
* commit '3193b13aa1':
  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>
This commit is contained in:
Michael Niedermayer 2012-12-24 15:29:15 +01:00
commit ba8e909c82
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libavfilter/allfilters.c
View file

@ -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);
}
}