From b9fefc87c01bbf464fb74981313efa77e03735f6 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Wed, 18 Apr 2012 01:27:55 +0300
Subject: stream_ffmpeg: fix broken line from 30afc64532ff61

Commit 30afc64532ff61 ("stream_ffmpeg: switch to libavformat avio
API") somehow contained a nonsense line which broke the control()
function. Fix. Also add avformat_network_init() to central libav
initialization code to avoid warnings.
---
 stream/stream_ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'stream/stream_ffmpeg.c')

diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c
index a76b9e5f3b..af71675713 100644
--- a/stream/stream_ffmpeg.c
+++ b/stream/stream_ffmpeg.c
@@ -56,7 +56,7 @@ static int seek(stream_t *s, off_t newpos)
 
 static int control(stream_t *s, int cmd, void *arg)
 {
-    AVIOContext *avio = avio;
+    AVIOContext *avio = s->priv;
     int64_t size, ts;
     double pts;
     switch(cmd) {
-- 
cgit v1.2.3