fix build with latest ffmpeg versions, bug #539116

Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

1 files changed, 32 insertions, 0 deletions

diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch
new file mode 100644
index 000000000000..d08f3b0c5f00
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch
@@ -0,0 +1,32 @@
+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;