RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-21 22:57:00 +00:00
Code Issues Releases Wiki Activity

screenshot: fix dependency on sizeof(AVFrame)

Browse Source 
The AVFrame data structure may be extended at the end in new
binary-compatible libavcodec versions. Therefore applications should
not depend on the size of the structure. But screenshot.c declared an
"AVFrame pic;" on stack. Change the code to allocate an AVFrame with
avcodec_alloc_frame() instead. The frame is now stored in struct
screenshot_ctx (rather than reallocated each time).
This commit is contained in:
Uoti Urpala 2012-04-15 17:48:12 +03:00
parent b711624ef3
commit aadf1002f8
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
screenshot.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include <assert.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
@ -43,6 +44,7 @@
#include "libvo/csputils.h" #include "libvo/csputils.h"
typedef struct screenshot_ctx { typedef struct screenshot_ctx {
AVFrame *pic;
int full_window; int full_window;
int each_frame; int each_frame;
int using_vf_screenshot; int using_vf_screenshot;
@ -51,10 +53,22 @@ typedef struct screenshot_ctx {
char fname[102]; char fname[102];
} screenshot_ctx; } screenshot_ctx;
static int destroy_ctx(void *ptr)
{
struct screenshot_ctx *ctx = ptr;
av_free(ctx->pic);
return 0;
}
static screenshot_ctx *screenshot_get_ctx(MPContext *mpctx) static screenshot_ctx *screenshot_get_ctx(MPContext *mpctx)
{ {
if (!mpctx->screenshot_ctx) if (!mpctx->screenshot_ctx) {
mpctx->screenshot_ctx = talloc_zero(mpctx, screenshot_ctx); struct screenshot_ctx *ctx = talloc_zero(mpctx, screenshot_ctx);
talloc_set_destructor(ctx, destroy_ctx);
ctx->pic = avcodec_alloc_frame();
assert(ctx->pic);
mpctx->screenshot_ctx = ctx;
}
return mpctx->screenshot_ctx; return mpctx->screenshot_ctx;
} }
@ -91,13 +105,13 @@ static int write_png(screenshot_ctx *ctx, struct mp_image *image)
if (!outbuffer) if (!outbuffer)
goto error_exit; goto error_exit;
AVFrame pic; AVFrame *pic = ctx->pic;
avcodec_get_frame_defaults(&pic); avcodec_get_frame_defaults(pic);
for (int n = 0; n < 4; n++) { for (int n = 0; n < 4; n++) {
pic.data[n] = image->planes[n]; pic->data[n] = image->planes[n];
pic.linesize[n] = image->stride[n]; pic->linesize[n] = image->stride[n];
} }
int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic); int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, pic);
if (size < 1) if (size < 1)
goto error_exit; goto error_exit;