svn commit: r469076 - head/graphics/amide/files

[Jan Beich]

Author: jbeich
Date: Fri May  4 21:43:05 2018
New Revision: 469076
URL: https://svnweb.freebsd.org/changeset/ports/469076

Log:
  graphics/amide: simplify after r468439
  
  AV_CODEC_ID_MPEG4 defaults to EPZS since FFmpeg 2.8
  https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/0b6f092ed3

Modified:
  head/graphics/amide/files/patch-src_mpeg__encode.c   (contents, props changed)

Modified: head/graphics/amide/files/patch-src_mpeg__encode.c
==============================================================================
--- head/graphics/amide/files/patch-src_mpeg__encode.c	Fri May  4 21:39:02 2018	(r469075)
+++ head/graphics/amide/files/patch-src_mpeg__encode.c	Fri May  4 21:43:05 2018	(r469076)
@@ -31,7 +31,7 @@
    if (!encode->picture) {
      g_warning("couldn't allocate memory for encode->picture");
      encode_free(encode);
-@@ -293,11 +294,13 @@ gpointer mpeg_encode_setup(gchar * output_filename, mp
+@@ -293,11 +294,10 @@ gpointer mpeg_encode_setup(gchar * output_filename, mp
    encode->context->time_base= (AVRational){1,FRAMES_PER_SECOND};
    encode->context->gop_size = 10; /* emit one intra frame every ten frames */
    encode->context->max_b_frames=10;
@@ -40,9 +40,7 @@
  
    /* encoding parameters */
    encode->context->sample_aspect_ratio= (AVRational){1,1}; /* our pixels are square */
-+#if LIBAVCODEC_VERSION_MAJOR < 58
-   encode->context->me_method=5; /* 5 is epzs */
-+#endif
+-  encode->context->me_method=5; /* 5 is epzs */
    encode->context->trellis=2; /* turn trellis quantization on */
  
    /* open it */