PIX_FMT_* constants are deprecated, use AV_PIX_FMT_* instead

This commit is contained in:
Ilari Liusvaara 2017-01-24 16:28:57 +02:00
parent c5d441c6b0
commit 669381821e
3 changed files with 5 additions and 5 deletions

View file

@ -1486,8 +1486,8 @@ void wxeditor_movie::_moviepanel::popup_axis_panel(uint64_t row, control_info ci
buf.resize(3 * (ciX.rmax - ciX.rmin + 1) * (ciY.rmax - ciY.rmin + 1));
unsigned offX = -ciX.rmin;
unsigned offY = -ciY.rmin;
struct SwsContext* ctx = sws_getContext(osize.first, osize.second, PIX_FMT_RGBA,
size.first, size.second, PIX_FMT_BGR24, SWS_POINT, NULL, NULL, NULL);
struct SwsContext* ctx = sws_getContext(osize.first, osize.second, AV_PIX_FMT_RGBA,
size.first, size.second, AV_PIX_FMT_BGR24, SWS_POINT, NULL, NULL, NULL);
uint8_t* srcp[1];
int srcs[1];
uint8_t* dstp[1];

View file

@ -285,8 +285,8 @@ void wxeditor_tasinput::xypanel::on_paint(wxPaintEvent& e)
buf.resize(3 * (t.xmax - t.xmin + 1) * (t.ymax - t.ymin + 1));
unsigned offX = -t.xmin;
unsigned offY = -t.ymin;
rctx = sws_getCachedContext(rctx, osize.first, osize.second, PIX_FMT_RGBA,
size.first, size.second, PIX_FMT_BGR24, SWS_POINT, NULL, NULL, NULL);
rctx = sws_getCachedContext(rctx, osize.first, osize.second, AV_PIX_FMT_RGBA,
size.first, size.second, AV_PIX_FMT_BGR24, SWS_POINT, NULL, NULL, NULL);
uint8_t* srcp[1];
int srcs[1];
uint8_t* dstp[1];

View file

@ -972,7 +972,7 @@ void wxwin_mainwindow::panel::on_paint(wxPaintEvent& e)
uint32_t h = inst.fbuf->main_screen.get_height();
if(w && h)
sws_ctx = sws_getCachedContext(sws_ctx, rotate_enabled ? h : w, rotate_enabled ? w : h,
PIX_FMT_RGBA, tw, th, PIX_FMT_BGR24, scaling_flags, NULL, NULL, NULL);
AV_PIX_FMT_RGBA, tw, th, AV_PIX_FMT_BGR24, scaling_flags, NULL, NULL, NULL);
tw = max(tw, static_cast<uint32_t>(128));
th = max(th, static_cast<uint32_t>(112));
screen_buffer = new unsigned char[tw * th * 3 + 64];