diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-15 09:14:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-15 09:14:43 +0100 |
| commit | b67a3505b58ffd204ee1a2560be3026688be8f10 (patch) | |
| tree | ca714b9d7101a9973573d89a5be586d3a0edd4b9 /src/wx | |
| parent | 0165a71f3074233f03c868cce9b760e51cc10ff5 (diff) | |
Use AV_ prefixes on some FFmpeg bits.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 4 | ||||
| -rw-r--r-- | src/wx/video_waveform_plot.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 27c8d23b6..5cbe884ec 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -186,7 +186,7 @@ FilmViewer::get (DCPTime p, bool accurate) if (!pvf.empty ()) { try { - _frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); + _frame = pvf.front()->image (AV_PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); ImageChanged (pvf.front ()); dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; @@ -194,7 +194,7 @@ FilmViewer::get (DCPTime p, bool accurate) yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb(); } - _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false); + _frame = _frame->scale (_frame->size(), yuv_to_rgb, AV_PIX_FMT_RGB24, false); _position = pvf.front()->time (); _inter_position = pvf.front()->inter_position (); _inter_size = pvf.front()->inter_size (); diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc index a9100b4b4..0dedd9bb1 100644 --- a/src/wx/video_waveform_plot.cc +++ b/src/wx/video_waveform_plot.cc @@ -137,7 +137,7 @@ VideoWaveformPlot::create_waveform () } dcp::Size const size = _image->size(); - _waveform.reset (new Image (PIX_FMT_RGB24, dcp::Size (size.width, size.height), true)); + _waveform.reset (new Image (AV_PIX_FMT_RGB24, dcp::Size (size.width, size.height), true)); for (int x = 0; x < size.width; ++x) { @@ -166,7 +166,7 @@ VideoWaveformPlot::create_waveform () _waveform = _waveform->scale ( dcp::Size (GetSize().GetWidth() - 32, GetSize().GetHeight() - _vertical_margin * 2), - dcp::YUV_TO_RGB_REC709, PIX_FMT_RGB24, false + dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false ); } |