[gentoo-commits] gentoo-x86 commit in x11-misc/electricsheep/files: electricsheep-2.7_beta11-ffmpeg2.patch

[Alexis Ballier (aballier)]

aballier    15/02/06 15:52:12

  Added:                electricsheep-2.7_beta11-ffmpeg2.patch
  Log:
  fix build with latest ffmpeg versions, bug #539116
  
  Signed-off-by: aballier@g.o
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.1                  x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch?rev=1.1&content-type=text/plain

Index: electricsheep-2.7_beta11-ffmpeg2.patch
===================================================================
Index: electricsheep-2.7_beta11/electricsheep.c
===================================================================
--- electricsheep-2.7_beta11.orig/electricsheep.c
+++ electricsheep-2.7_beta11/electricsheep.c
@@ -657,7 +657,7 @@ void copy_out_file(char *fname) {
 	exit(1);
     }
 
-    if (0 > av_find_stream_info(ictx)) {
+    if (0 > avformat_find_stream_info(ictx, NULL)) {
 	fprintf(logout, "%s: could not find codec parameters\n", fname);
 	exit(1);
     }
@@ -698,7 +698,8 @@ void copy_out_file(char *fname) {
 	}
 	output_ctx->oformat = ofmt;
 
-	st = av_new_stream(output_ctx, output_ctx->nb_streams);
+	st = avformat_new_stream(output_ctx, NULL);
+	if(st) st->id = output_ctx->nb_streams;
 
 	icodec = ictx->streams[input_stream_index]->codec;
 	codec = output_ctx->streams[0]->codec;
@@ -741,7 +742,7 @@ void copy_out_file(char *fname) {
 	av_free_packet(&opkt);
 	av_free_packet(&ipkt);
     }
-    av_close_input_file(ictx);
+    avformat_close_input(&ictx);
 }
 
 time_t search_time;