summaryrefslogtreecommitdiff
path: root/src/lib/player_video.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-06 22:43:52 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-06 22:43:52 +0000
commited68bfad5c795afb342c5228f3c1dc7770a6d646 (patch)
treeebf0a5b7f2c9b1636c498715f0f7aaaf8dcc98f7 /src/lib/player_video.cc
parente5b744922fb6aed65ec13f22a9de0c86dd1bd561 (diff)
Switch PlayerVideo::always_rgb to a new ::force and use it in FFmpegFileEncoder.
Diffstat (limited to 'src/lib/player_video.cc')
-rw-r--r--src/lib/player_video.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 376ace128..c9ed6a6e4 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -105,7 +105,7 @@ PlayerVideo::set_text (PositionImage image)
/** Create an image for this frame.
* @param pixel_format Function which is called to decide what pixel format the output image should be;
* it is passed the pixel format of the input image from the ImageProxy, and should return the desired
- * output pixel format. Two functions always_rgb and keep_xyz_or_rgb are provided for use here.
+ * output pixel format. Two functions force and keep_xyz_or_rgb are provided for use here.
* @param aligned true if the output image should be aligned to 32-byte boundaries.
* @param fast true to be fast at the expense of quality.
*/
@@ -254,9 +254,9 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
}
AVPixelFormat
-PlayerVideo::always_rgb (AVPixelFormat)
+PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
{
- return AV_PIX_FMT_RGB24;
+ return force_to;
}
AVPixelFormat