mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-26 18:30:52 +08:00
fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
Originally committed as revision 2884 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
committed by
Michael Niedermayer
parent
8be014e027
commit
c3775e542f
@@ -45,7 +45,7 @@ void av_register_all(void)
|
||||
avienc_init();
|
||||
#endif //CONFIG_ENCODERS
|
||||
avidec_init();
|
||||
wav_init();
|
||||
ff_wav_init();
|
||||
swf_init();
|
||||
au_init();
|
||||
#ifdef CONFIG_ENCODERS
|
||||
@@ -56,7 +56,7 @@ void av_register_all(void)
|
||||
movenc_init();
|
||||
jpeg_init();
|
||||
#endif //CONFIG_ENCODERS
|
||||
dv_init();
|
||||
ff_dv_init();
|
||||
fourxm_init();
|
||||
#ifdef CONFIG_ENCODERS
|
||||
flvenc_init();
|
||||
|
||||
Reference in New Issue
Block a user