summaryrefslogtreecommitdiff
path: root/modules/media
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2018-04-10 14:21:50 +0200
committerBenjamin Otte <otte@redhat.com>2018-04-10 15:13:38 +0200
commit12063fe53e414e47b3ce1d19186344d2a9d1bfb9 (patch)
tree1cebe65e8ebfd303431f1369b7a8b9acca63f4af /modules/media
parentf24d0725ca00edb49614fb0b70962129f42d83b4 (diff)
downloadgtk+-12063fe53e414e47b3ce1d19186344d2a9d1bfb9.tar.gz
ffmpeg: Fix compile warnings for newest version
Diffstat (limited to 'modules/media')
-rw-r--r--modules/media/gtkffmediafile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/media/gtkffmediafile.c b/modules/media/gtkffmediafile.c
index 4ae1621575..7f6244224e 100644
--- a/modules/media/gtkffmediafile.c
+++ b/modules/media/gtkffmediafile.c
@@ -176,7 +176,9 @@ g_io_module_load (GIOModule *module)
{
g_type_module_use (G_TYPE_MODULE (module));
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (58, 9, 100)
av_register_all ();
+#endif
g_io_extension_point_implement (GTK_MEDIA_FILE_EXTENSION_POINT_NAME,
GTK_TYPE_FF_MEDIA_FILE,
@@ -363,7 +365,7 @@ gtk_ff_media_file_decode_frame (GtkFfMediaFile *video,
gtk_video_frame_ffmpeg_init (result,
texture,
- av_rescale_q (av_frame_get_best_effort_timestamp (frame),
+ av_rescale_q (frame->best_effort_timestamp,
video->format_ctx->streams[video->stream_id]->time_base,
(AVRational) { 1, G_USEC_PER_SEC }));