Merge branch 'master' into lpcm_encoder

Conflicts:
	NEWS

diff --combined 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).
@@@ -26,8 -26,9 +27,9 @@@
  
  Interfaces
   * The telnet interface has been removed in the favour of the lua one
-  * Skins2 / Qt: misc improvements
-  * Qt: port to Mac platform
+  * Skins2 / Qt: misc improvements and usability fixes
+  * Qt: effects dialogs reordering
+  * Qt: port to MacOS X platform
  
  Video Output:
   * New video output based on Direct2D for Windows 7 and Vista (with Platform Update)
@@@ -51,14 -52,32 +53,32 @@@ Stream output
      index-url=http://url-to-iphonestreamfile-###.ts},mux=ts{use-key-frames},
      dst=public_html/iphonestreamfile-###.ts}"
  
- Translations:
-  * New Armenian translation
- 
  libVLC:
   * New capabilities for libVLC:
    ** libvlc_media_player_navigate for DVD navigation
  
  
+ Changes between 1.1.4 and 1.1.4.1:
+ ----------------------------------
+ 
+ Mac OS X:
+  * Fixed video output on PowerPC-based Macs for videos with widths divisible
+    by 16
+  * Fixed an issue with the Equalizer's 170Hz slider
+ 
+ Demuxer:
+  * Fix crash when closing rtsp streams
+ 
+ Qt interface:
+  * Fix Windows 7 jumplists with Unicode files
+  * Various fixes for Windows
+ 
+ Translations:
+  * New Armenian translation
+  * Update translations for Dutch, Estonian, Lithuanian, Japanese, Nynorsk,
+    Brazillian Portuguese, Armenian, Wallon
+ 
+ 
  Changes between 1.1.3 and 1.1.4:
  --------------------------------