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

[Alexis Ballier (aballier)]

aballier    13/03/03 12:29:45

  Added:                electricsheep-2.7_beta11-ffmpeg1.patch
  Log:
  fix build with ffmpeg-1, bug #458912
  
  (Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

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

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

Index: electricsheep-2.7_beta11-ffmpeg1.patch
===================================================================
Index: electricsheep-2.7_beta11/electricsheep.c
===================================================================
--- electricsheep-2.7_beta11.orig/electricsheep.c
+++ electricsheep-2.7_beta11/electricsheep.c
@@ -652,7 +652,7 @@ void copy_out_file(char *fname) {
       return;
     }
 
-    if (0 > av_open_input_file(&ictx, fname, NULL, 0, NULL)) {
+    if (0 > avformat_open_input(&ictx, fname, NULL, NULL)) {
 	perror(fname);
 	exit(1);
     }
@@ -699,8 +699,6 @@ void copy_out_file(char *fname) {
 	output_ctx->oformat = ofmt;
 
 	st = av_new_stream(output_ctx, output_ctx->nb_streams);
-	st->stream_copy = 1;
-	av_set_parameters(output_ctx, NULL);
 
 	icodec = ictx->streams[input_stream_index]->codec;
 	codec = output_ctx->streams[0]->codec;
@@ -718,12 +716,12 @@ void copy_out_file(char *fname) {
 	codec->height = icodec->height;
 	codec->has_b_frames = icodec->has_b_frames;
 
-	if (url_fopen(&output_ctx->pb, pipe, URL_WRONLY) < 0) {
+	if (avio_open(&output_ctx->pb, pipe, AVIO_FLAG_WRITE) < 0) {
 	    fprintf(logout, "Could not open '%s'\n", pipe);
 	    exit(1);
 	}
 
-	av_write_header(output_ctx);
+	avformat_write_header(output_ctx, NULL);
     }
 
     while (1) {