aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2016-11-15 00:38:12 +0100
committerMarton Balint <cus@passwd.hu>2016-11-20 23:38:06 +0100
commit58af48f1c3cc98afc1f25d494f197148801cf210 (patch)
tree636b8737d38537cba73b01036c9728a181fa7fc6
parent8c1342e631d635f6cad13f9374c4f2005c22b9e5 (diff)
downloadffmpeg-58af48f1c3cc98afc1f25d494f197148801cf210.tar.gz
ffplay: add support for negative RGBA linesize
This fixes the crash reported in ticket #5947. Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--ffplay.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/ffplay.c b/ffplay.c
index 79dc76889e..12502f2764 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -165,6 +165,7 @@ typedef struct Frame {
int format;
AVRational sar;
int uploaded;
+ int flip_v;
} Frame;
typedef struct FrameQueue {
@@ -861,12 +862,20 @@ static int upload_texture(SDL_Texture *tex, AVFrame *frame, struct SwsContext **
int ret = 0;
switch (frame->format) {
case AV_PIX_FMT_YUV420P:
+ if (frame->linesize[0] < 0 || frame->linesize[1] < 0 || frame->linesize[2] < 0) {
+ av_log(NULL, AV_LOG_ERROR, "Negative linesize is not supported for YUV.\n");
+ return -1;
+ }
ret = SDL_UpdateYUVTexture(tex, NULL, frame->data[0], frame->linesize[0],
frame->data[1], frame->linesize[1],
frame->data[2], frame->linesize[2]);
break;
case AV_PIX_FMT_BGRA:
- ret = SDL_UpdateTexture(tex, NULL, frame->data[0], frame->linesize[0]);
+ if (frame->linesize[0] < 0) {
+ ret = SDL_UpdateTexture(tex, NULL, frame->data[0] + frame->linesize[0] * (frame->height - 1), -frame->linesize[0]);
+ } else {
+ ret = SDL_UpdateTexture(tex, NULL, frame->data[0], frame->linesize[0]);
+ }
break;
default:
/* This should only happen if we are not using avfilter... */
@@ -949,9 +958,10 @@ static void video_image_display(VideoState *is)
if (upload_texture(vp->bmp, vp->frame, &is->img_convert_ctx) < 0)
return;
vp->uploaded = 1;
+ vp->flip_v = vp->frame->linesize[0] < 0;
}
- SDL_RenderCopy(renderer, vp->bmp, NULL, &rect);
+ SDL_RenderCopyEx(renderer, vp->bmp, NULL, &rect, 0, NULL, vp->flip_v ? SDL_FLIP_VERTICAL : 0);
if (sp) {
#if USE_ONEPASS_SUBTITLE_RENDER
SDL_RenderCopy(renderer, is->sub_texture, NULL, &rect);