Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavdevice / xv.c

diff --git a/libavdevice/xv.c b/libavdevice/xv.c
index 348c289..cba933e 100644 (file)
--- a/libavdevice/xv.c
+++ b/libavdevice/xv.c
@@ -32,6 +32,7 @@
 #include <X11/extensions/Xvlib.h>
 #include <sys/shm.h>
 
+#include "libavutil/frame.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
@@ -314,8 +315,8 @@ static int write_picture(AVFormatContext *s, uint8_t *input_data[4],
         }
     }
 
-    av_image_copy(data, img->pitches, (const uint8_t **)input_data, linesize,
-                  xv->image_format, img->width, img->height);
+    av_image_copy2(data, img->pitches, input_data, linesize,
+                   xv->image_format, img->width, img->height);
     return xv_repaint(s);
 }
 
@@ -376,17 +377,17 @@ static const AVClass xv_class = {
     .category   = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT,
 };
 
-const AVOutputFormat ff_xv_muxer = {
-    .name           = "xv",
-    .long_name      = NULL_IF_CONFIG_SMALL("XV (XVideo) output device"),
+const FFOutputFormat ff_xv_muxer = {
+    .p.name         = "xv",
+    .p.long_name    = NULL_IF_CONFIG_SMALL("XV (XVideo) output device"),
+    .p.audio_codec   = AV_CODEC_ID_NONE,
+    .p.video_codec   = AV_CODEC_ID_WRAPPED_AVFRAME,
+    .p.flags         = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS,
+    .p.priv_class    = &xv_class,
     .priv_data_size = sizeof(XVContext),
-    .audio_codec    = AV_CODEC_ID_NONE,
-    .video_codec    = AV_CODEC_ID_WRAPPED_AVFRAME,
     .write_header   = xv_write_header,
     .write_packet   = xv_write_packet,
     .write_uncoded_frame = xv_write_frame,
     .write_trailer  = xv_write_trailer,
     .control_message = xv_control_message,
-    .flags          = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS,
-    .priv_class     = &xv_class,
 };