diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-01 21:30:13 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-02 08:38:09 +0200 |
| commit | 58fd70b04decdb7e5580c06b1be3bd573fabeeda (patch) | |
| tree | a13f8aa9c031454cced78bc00589fa7f647862cb | |
| parent | 3c194f390fe7e18a6e2e51eb4f29495eb230585e (diff) | |
| download | ffmpeg-streaming-58fd70b04decdb7e5580c06b1be3bd573fabeeda.zip ffmpeg-streaming-58fd70b04decdb7e5580c06b1be3bd573fabeeda.tar.gz | |
Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.
| -rw-r--r-- | libavfilter/libmpcodecs/vf_sab.c | 2 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/vf_scale.h | 1 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/vf_smartblur.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_mp.c | 4 |
4 files changed, 2 insertions, 7 deletions
diff --git a/libavfilter/libmpcodecs/vf_sab.c b/libavfilter/libmpcodecs/vf_sab.c index 377c9e3..51e9d78 100644 --- a/libavfilter/libmpcodecs/vf_sab.c +++ b/libavfilter/libmpcodecs/vf_sab.c @@ -102,7 +102,7 @@ static int allocStuff(FilterParam *f, int width, int height){ swsF.lumH= swsF.lumV= vec; swsF.chrH= swsF.chrV= NULL; f->preFilterContext= sws_getContext( - width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, get_sws_cpuflags()|SWS_POINT, &swsF, NULL, NULL); + width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL); sws_freeVec(vec); vec = sws_getGaussianVec(f->strength, 5.0); diff --git a/libavfilter/libmpcodecs/vf_scale.h b/libavfilter/libmpcodecs/vf_scale.h index 91ed103..4de3b48 100644 --- a/libavfilter/libmpcodecs/vf_scale.h +++ b/libavfilter/libmpcodecs/vf_scale.h @@ -29,7 +29,6 @@ extern float sws_lum_sharpen; extern int sws_flags; -int get_sws_cpuflags(void); struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); #endif /* MPLAYER_VF_SCALE_H */ diff --git a/libavfilter/libmpcodecs/vf_smartblur.c b/libavfilter/libmpcodecs/vf_smartblur.c index 8acdb73..5bfcb28 100644 --- a/libavfilter/libmpcodecs/vf_smartblur.c +++ b/libavfilter/libmpcodecs/vf_smartblur.c @@ -87,7 +87,7 @@ static int allocStuff(FilterParam *f, int width, int height){ swsF.lumH= swsF.lumV= vec; swsF.chrH= swsF.chrV= NULL; f->filterContext= sws_getContext( - width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC | get_sws_cpuflags(), &swsF, NULL, NULL); + width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL); sws_freeVec(vec); diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 7dd8a64..01a8f06 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -287,10 +287,6 @@ zrmjpeg CpuCaps gCpuCaps; //FIXME initialize this so optims work -int get_sws_cpuflags(void){ - return 0; -} - static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam) { static int firstTime=1; |
