Packman Build Service PMBS

Changes of Revision 11

ffmpeg4.patch Changed

@@ -650,7 +650,7 @@
 Index: import/import_ffmpeg.c
 ===================================================================
 --- import/import_ffmpeg.c.orig	2019-02-14 14:47:24.220049209 +0200
-+++ import/import_ffmpeg.c	2019-02-14 14:47:24.260050793 +0200
++++ import/import_ffmpeg.c	2019-02-14 15:32:56.313002281 +0200
 @@ -310,7 +310,7 @@ do_avi:
      lavc_dec_context->width  = x_dim;
      lavc_dec_context->height = y_dim;
@@ -660,6 +660,48 @@
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
      lavc_dec_context->error_resilience  = 2;
  #else
+@@ -580,8 +580,8 @@ retry:
+ 
+     // Convert avcodec image to our internal YUV or RGB format
+     switch (lavc_dec_context->pix_fmt) {
+-      case PIX_FMT_YUVJ420P:
+-      case PIX_FMT_YUV420P:
++      case AV_PIX_FMT_YUVJ420P:
++      case AV_PIX_FMT_YUV420P:
+         src_fmt = IMG_YUV420P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
+@@ -612,7 +612,7 @@ retry:
+ 	}
+         break;
+ 
+-      case PIX_FMT_YUV411P:
++      case AV_PIX_FMT_YUV411P:
+         src_fmt = IMG_YUV411P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
+@@ -640,8 +640,8 @@ retry:
+         }
+         break;
+ 
+-      case PIX_FMT_YUVJ422P:
+-      case PIX_FMT_YUV422P:
++      case AV_PIX_FMT_YUVJ422P:
++      case AV_PIX_FMT_YUV422P:
+         src_fmt = IMG_YUV422P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
+@@ -669,8 +669,8 @@ retry:
+         }
+ 	break;
+ 
+-      case PIX_FMT_YUVJ444P:
+-      case PIX_FMT_YUV444P:
++      case AV_PIX_FMT_YUVJ444P:
++      case AV_PIX_FMT_YUV444P:
+         src_fmt = IMG_YUV444P;
+         YUV_INIT_PLANES(src_planes, frame, src_fmt,
+                         lavc_dec_context->width, lavc_dec_context->height);
 Index: import/decode_lavc.c
 ===================================================================
 --- import/decode_lavc.c.orig	2019-02-14 14:47:24.220049209 +0200