RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mp_image: make mp_image_copy_fields_* private 

Future code should always use mp_image_{to,from}_av_frame(). Everything
else is way too messy and fragile.
This commit is contained in:
wm4 2016-04-15 15:48:02 +02:00
parent a77cbc504a
commit 050b17ca9c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/mp_image.c
View File

@ -666,8 +666,8 @@ void mp_image_params_guess_csp(struct mp_image_params *params)
// Copy properties and data of the AVFrame into the mp_image, without taking // Copy properties and data of the AVFrame into the mp_image, without taking
// care of memory management issues. // care of memory management issues.
void mp_image_copy_fields_from_av_frame(struct mp_image *dst, static void mp_image_copy_fields_from_av_frame(struct mp_image *dst,
struct AVFrame *src) struct AVFrame *src)
{ {
mp_image_setfmt(dst, pixfmt2imgfmt(src->format)); mp_image_setfmt(dst, pixfmt2imgfmt(src->format));
mp_image_set_size(dst, src->width, src->height); mp_image_set_size(dst, src->width, src->height);
@ -690,8 +690,8 @@ void mp_image_copy_fields_from_av_frame(struct mp_image *dst,
// Copy properties and data of the mp_image into the AVFrame, without taking // Copy properties and data of the mp_image into the AVFrame, without taking
// care of memory management issues. // care of memory management issues.
void mp_image_copy_fields_to_av_frame(struct AVFrame *dst, static void mp_image_copy_fields_to_av_frame(struct AVFrame *dst,
struct mp_image *src) struct mp_image *src)
{ {
dst->format = imgfmt2pixfmt(src->imgfmt); dst->format = imgfmt2pixfmt(src->imgfmt);
dst->width = src->w; dst->width = src->w;

4
video/mp_image.h
View File

@ -154,10 +154,6 @@ void mp_image_set_attributes(struct mp_image *image,
const struct mp_image_params *params); const struct mp_image_params *params);
struct AVFrame; struct AVFrame;
void mp_image_copy_fields_from_av_frame(struct mp_image *dst,
struct AVFrame *src);
void mp_image_copy_fields_to_av_frame(struct AVFrame *dst,
struct mp_image *src);
struct mp_image *mp_image_from_av_frame(struct AVFrame *av_frame); struct mp_image *mp_image_from_av_frame(struct AVFrame *av_frame);
struct AVFrame *mp_image_to_av_frame(struct mp_image *img); struct AVFrame *mp_image_to_av_frame(struct mp_image *img);
struct AVFrame *mp_image_to_av_frame_and_unref(struct mp_image *img); struct AVFrame *mp_image_to_av_frame_and_unref(struct mp_image *img);