summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-04-18 01:27:55 +0300
committerUoti Urpala <uau@mplayer2.org>2012-04-18 01:27:55 +0300
commitb9fefc87c01bbf464fb74981313efa77e03735f6 (patch)
tree1a6045f81b1155dd2870bd07e9bb48cf27e0d0e5
parent81eb9117633e77514361f219ee4a72a88701d313 (diff)
downloadmpv-b9fefc87c01bbf464fb74981313efa77e03735f6.tar.bz2
mpv-b9fefc87c01bbf464fb74981313efa77e03735f6.tar.xz
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.
-rw-r--r--av_log.c1
-rw-r--r--stream/stream_ffmpeg.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/av_log.c b/av_log.c
index 63f8fd7dc3..4e27e98d0f 100644
--- 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
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) {