From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Mon, 27 Sep 2010 23:18:38 +0000 (+0200)
Subject: Merge branch 'master' into lpcm_encoder
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=e50a251c828bfc7ce98813959abc49e1ce0580fe

Merge branch 'master' into lpcm_encoder

Conflicts:
	NEWS
---

e50a251c828bfc7ce98813959abc49e1ce0580fe
diff --cc NEWS
index 17d8522474,f61d59bb0c..dd935d46e9
--- a/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).