diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 15:11:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 15:11:34 +0200 |
| commit | d6f6a7557c8d25bb9943b4d3390550a9cffb918b (patch) | |
| tree | d3f96d36dc86276ae0018c4294d416c972f3ea28 /libavfilter/vf_scale.c | |
| parent | de3b1116dab12843b833e828bb219fb5673b0092 (diff) | |
| parent | 7638f0b2fef0481e55985ab8530e8ad9c16f113a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Do not make ff_ symbols globally visible.
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
build: tms470: work around glibc math.h problems
configure: improve tms470 compiler usage with glibc
Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_scale.c')
| -rw-r--r-- | libavfilter/vf_scale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index bc7f20c3d7..c42f9f20aa 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -320,7 +320,7 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) outpicref->video->h = outlink->h; if(scale->output_is_pal) - ff_set_systematic_pal2((uint32_t*)outpicref->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format); + avpriv_set_systematic_pal2((uint32_t*)outpicref->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format); av_reduce(&outpicref->video->sample_aspect_ratio.num, &outpicref->video->sample_aspect_ratio.den, (int64_t)picref->video->sample_aspect_ratio.num * outlink->h * link->w, |