]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' into lpcm_encoder
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 23:18:38 +0000 (01:18 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 23:18:38 +0000 (01:18 +0200)
Conflicts:
NEWS

1  2 
NEWS

diff --cc NEWS
index 17d8522474d221d842fc455a9aed2ea0049150e4,f61d59bb0cd83f18966ce85b92ca1ab485cff7aa..dd935d46e97cc96ca80fd23a268dfb3c0937a402
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -18,7 -18,7 +18,8 @@@ Acces
  
  Codecs
   * You can now use ffmpeg-mt in conjunction with vlc
+  * Important fixes for RealVideo 3.0 and 4.0 playback
 + * Encode support for DVD LPCM
  
  Demuxers:
   * id3tag plugin is removed (superseded by taglib).