diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:25:04 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:25:04 +0300 |
commit | 8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9 (patch) | |
tree | a7be3f915e6d2d8a3d06544fbbdd692dcf19956d /libmpdemux | |
parent | 78f51a921f0141362fc95f215ffade5e87d87578 (diff) | |
parent | c36de0867fc576ad5fd58fc28bd5fe3322579f36 (diff) | |
download | mpv-8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9.tar.bz2 mpv-8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9.tar.xz |
Merge svn changes up to r31226
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_lavf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 2d7e6092e1..497ff563bf 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -213,6 +213,7 @@ static const char * const preferred_list[] = { "mpc", "mpc8", "mxf", + "ogg", "swf", "vqf", "w64", |