FreeBSD Bugzilla – Attachment 177510 Details for
Bug 214896
multimedia/mplayer2: fails to build with ffmpeg 3.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-mplayer2_screenshot.c
patch-mplayer2_screenshot.c.diff (text/plain), 1.40 KB, created by
Carlos J. Puga Medina
on 2016-11-29 12:42:17 UTC
(
hide
)
Description:
patch-mplayer2_screenshot.c
Filename:
MIME Type:
Creator:
Carlos J. Puga Medina
Created:
2016-11-29 12:42:17 UTC
Size:
1.40 KB
patch
obsolete
>--- screenshot.c.orig 2016-11-29 12:32:11.557338000 +0100 >+++ screenshot.c 2016-11-29 13:35:02.674245000 +0100 >@@ -57,7 +57,7 @@ > { > struct screenshot_ctx *ctx = ptr; > #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) >- avcodec_free_frame(&ctx->pic); >+ av_frame_free(&ctx->pic); > #else > av_free(ctx->pic); > #endif >@@ -69,7 +69,7 @@ > if (!mpctx->screenshot_ctx) { > struct screenshot_ctx *ctx = talloc_zero(mpctx, screenshot_ctx); > talloc_set_destructor(ctx, destroy_ctx); >- ctx->pic = avcodec_alloc_frame(); >+ ctx->pic = av_frame_alloc(); > assert(ctx->pic); > mpctx->screenshot_ctx = ctx; > } >@@ -94,7 +94,7 @@ > avctx->time_base = AV_TIME_BASE_Q; > avctx->width = image->width; > avctx->height = image->height; >- avctx->pix_fmt = PIX_FMT_RGB24; >+ avctx->pix_fmt = AV_PIX_FMT_RGB24; > avctx->compression_level = 0; > > if (avcodec_open2(avctx, png_codec, NULL) < 0) { >@@ -110,12 +110,12 @@ > goto error_exit; > > AVFrame *pic = ctx->pic; >- avcodec_get_frame_defaults(pic); >+ av_frame_unref(pic); > for (int n = 0; n < 4; n++) { > pic->data[n] = image->planes[n]; > pic->linesize[n] = image->stride[n]; > } >- int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, pic); >+ int size = avcodec_encode_video2(avctx, outbuffer, outbuffer_size, pic); > if (size < 1) > goto error_exit; >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 214896
:
177510
|
177530
|
177536
|
177564
|
177645
|
177646
|
177647
|
177649
|
177806