stream_ffmpeg: fix broken line from 30afc64

Uoti Urpala · Uoti Urpala · commit b9fefc87c01b · 2012-04-18T01:27:55.000+03:00
Commit 30afc64 ("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.
diff --git a/av_log.c b/av_log.c
@@ -112,6 +112,7 @@ void init_libav(void)
     av_log_set_callback(mp_msg_av_log_callback);
     avcodec_register_all();
     av_register_all();
+    avformat_network_init();
 }
 
 #define V(x) (x)>>16, (x)>>8 & 255, (x) & 255
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ void init_libav(void)`
`112`	`112`	`av_log_set_callback(mp_msg_av_log_callback);`
`113`	`113`	`avcodec_register_all();`
`114`	`114`	`av_register_all();`
	`115`	`+ avformat_network_init();`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`#define V(x) (x)>>16, (x)>>8 & 255, (x) & 255`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static int seek(stream_t *s, off_t newpos)`
`56`	`56`
`57`	`57`	`static int control(stream_t s, int cmd, void arg)`
`58`	`58`	`{`
`59`		`- AVIOContext *avio = avio;`
	`59`	`+ AVIOContext *avio = s->priv;`
`60`	`60`	`int64_t size, ts;`
`61`	`61`	`double pts;`
`62`	`62`	`switch(cmd) {`