Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > 75029033b88be7849626b2bd13e225db > files > 5

gpac-0.5.0-8.mga5.tainted.src.rpm

diff -up gpac/modules/ffmpeg_in/ffmpeg_demux.c.ffmpeg-2_4 gpac/modules/ffmpeg_in/ffmpeg_demux.c
--- gpac/modules/ffmpeg_in/ffmpeg_demux.c.ffmpeg-2_4	2014-11-15 08:44:44.797297475 +0100
+++ gpac/modules/ffmpeg_in/ffmpeg_demux.c	2014-11-15 08:51:52.022437673 +0100
@@ -338,7 +338,7 @@ static Bool FFD_CanHandleURL(GF_InputSer
 	}
 
 exit:
-    if (ctx) av_close_input_file(ctx);
+    if (ctx) avformat_close_input(&ctx);
 	return ret;
 }
 
@@ -697,7 +697,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
 
 		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
 		if (!ffd->seekable) {
-			av_close_input_file(ffd->ctx);
+			avformat_close_input(&ffd->ctx);
 			open_file(&ffd->ctx, szName, av_in);
 			avformat_find_stream_info(ffd->ctx, NULL);
 		}
@@ -711,7 +711,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
 
 err_exit:
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
-    if (ffd->ctx) av_close_input_file(ffd->ctx);
+    if (ffd->ctx) avformat_close_input(&ffd->ctx);
 	ffd->ctx = NULL;
 	gf_term_on_connect(serv, NULL, e);
 	return GF_OK;
@@ -765,7 +765,7 @@ static GF_Err FFD_CloseService(GF_InputS
 
 	ffd->is_running = 0;
 
-	if (ffd->ctx) av_close_input_file(ffd->ctx);
+	if (ffd->ctx) avformat_close_input(&ffd->ctx);
 	ffd->ctx = NULL;
 	ffd->audio_ch = ffd->video_ch = NULL;
 	ffd->audio_run = ffd->video_run = 0;