commit 33dfaa8a863507d584a41e276cfbde5d37c4d6a2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Dec 31 13:28:48 2012 +0100

    update NEWS

commit 823041974db256f9b70e1d882bee9f41b92ae8af
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Dec 27 20:52:05 2012 +0100

    puzzle: row and col values of 1 are not supported
    (cherry picked from commit 05f9c0acdbf2832d507724d644d32aa06c47cf65)
    
    Conflicts:
    	modules/video_filter/puzzle.c

commit 303a06f0c04f9ca32c59c09e03c704157b24cfae
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Dec 30 16:02:53 2012 +0100

    macosx: show lua intfs in advanced preferences
    
    hack adapted from the qt interface.
    
    close #7876
    (cherry picked from commit 3b4128149119c6b0f9575a6ec16f7d585ac7a388)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 120934306d80655cae490bc444df159a80ac72ba
Author: Denis Charmet <typx@dinauz.org>
Date:   Wed Dec 26 18:58:41 2012 +0100

    Handle with resilience unknown ebml elements
    
    Fix #7884 and #7887 by implementing the first proposition.
    (cherry picked from commit 6f8e8326ef82029d868d3c4729c9fd64e41a06f2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4f4a5d6e56477155c6b2ba1b836dba048994a6d8
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Dec 27 21:12:52 2012 +0100

    macosx: video effects: limit puzzle settings from 2 - 16
    
    (not cherry picked from 970ff89b610e5cf4e91a1941f353c9edf68a9169)

commit 8dff4d3b5557e93c3adda163d0f863c89dc4cc9e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Dec 27 16:06:35 2012 +0100

    macosx: video effects: fix text field / stepper syncronisation, fix enabled state of steppers
    
    (not cherry picked from not yet done commit)

commit d4526f98e26b51056a0188729a8eda51d9be72b4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Dec 27 00:24:11 2012 +0100

    macosx: adapt fspanel layout to update time slider graphics
    (cherry picked from commit 59d6ab773e2fcb7b112cee692ce34996491ce4b2)
    
    Conflicts:
    	NEWS
    	modules/gui/macosx/fspanel.m

commit a80779ade7e5c5aadfd753b6dc20ec82fbf83d0e
Author: Damien Erambert <damien.erambert@me.com>
Date:   Thu Dec 27 00:00:58 2012 +0100

    macosx: re-worked fullscreen time slider graphics to achieve a bigger click target
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit a62d893368a156f7b705f9c37d569e0e53e7fddb)

commit 5b9bf21dcdd07d98c31979d47408200659849860
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Dec 26 12:18:33 2012 +0100

    macosx: simplify ea98fcfc
    
    thanks to David for the feedback
    (cherry picked from commit 9322e135d79228221a0f52d4a745b43cb087be3f)
    
    Conflicts:
    	modules/gui/macosx/MainWindow.m
    	modules/gui/macosx/VideoView.m

commit cab9d6cb04488f57382d12da7d2abaada20936fc
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Dec 25 15:25:01 2012 +0100

    macosx: fixed subtitle rendering resolution when using the native fullscreen mode (close #7946)
    
    bug was triggered only when using controls provided by the OS like NSWindow's fullscreen button
    (cherry picked from commit ea98fcfc60555b5f06a7149b8142be0bfcfb2be8)
    
    Conflicts:
    	modules/gui/macosx/VideoView.m
    	modules/gui/macosx/intf.m

commit a1f97b91767bb820cf9bf44aef700ba97809705a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Dec 21 20:15:46 2012 +0200

    audio format: fix FI32 -> S16N conversion
    
    (cherry picked from commit 84fab3ddd6f554d922df1c18ae4ab1266598d383)

commit 75f7915e33e031ba51d4909a4db3589b82099a34
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Dec 21 02:01:53 2012 +0100

    Fix DxVA2 decoding on HD2000/3000
    
    Close #6243
    (cherry picked from commit 7f4f09b56e1943c866c243a3a981c3050566c923)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 14e8d8a7f5719fa45024d657e8038dd2c358eb53
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Dec 19 22:18:29 2012 +0200

    format: fix typo, conversion from S32N to S16N
    
    (cherry picked from commit 1d5cbf26f50d5e5067a5baee2e045a4ca4577fc5)

commit 9a3277e8226cf6661da16719dac8b84ba6255989
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Dec 19 18:08:23 2012 +0100

    npapi packaging: we don't need to fetch gecko headers anymore
    (cherry picked from commit 4c1beff0eab8fc5b97cc75bf52e9679f771b2d6b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3308b699e30c5c45262802370f461399ffa3f76c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Dec 18 15:34:36 2012 +0100

    Contrib: update live555
    
    Close #7786
    (cherry picked from commit 03f571782b24d486ab5c75cfb748dca736bc448e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 52157cf528851c7766b72222eac7ada382133110
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Dec 14 21:30:41 2012 +0200

    XCB/XVideo: fix flawed logic for adaptor selection
    
    (cherry picked from commit 45ab9b93592068dfb8380f6c99b062b1b7c34574)

commit 0e00f5e468c0c2ddb810338b49f2efc17d61e30e
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Dec 17 01:08:51 2012 +0100

    Fix EXTRA_DIST list

commit 2c6e48652a39be6b0fb031f560ecbe9d22dcc58d
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Dec 15 11:58:27 2012 +0100

    UAC: distribute source code (and doc+examples)
    (cherry picked from commit ed810a5693cac334050c06fe453eae44fb6eb868)
    
    Conflicts:
    	Makefile.am
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit a252b5059c8ef3cb67b267f52f1ebd7703bd5429
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Dec 16 11:06:42 2012 +0100

    UAC: rename file to get rid of spaces

commit b3500d99050f795447205ecc102d12c5e7367207
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Dec 16 11:04:29 2012 +0100

    contrib: we use libav nowadays.
    
    stay tuned.

commit 304b08cc5f99e4e5f40257679a847d33ad99d0c9
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Oct 30 11:21:02 2012 +0100

    taglib: fix windows static build
    (cherry picked from commit 2b004056c340aba439ea497449b823629d906264)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit c8ab67f32cd3b5f8ebdcd8c3bc5b4b54c873aa3f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Dec 15 15:19:43 2012 +0100

    Fix win32 plugins packaging
    (cherry picked from commit 1a3286356e0677c984d23bf5ba93f99efc134746)
    (cherry picked from commit 915f956bbfeda539a00fbc8dcd8d4a8bffbb0140)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 055b516e76389fa5fcc6d9e7fffa5e41acab6d5e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Dec 15 16:47:16 2012 +0100

    Merge NEWS from git

commit d9bf7d0d39b66b3924996171ef62fc10b88e872f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Dec 15 13:23:40 2012 +0100

    add missing 2.0.5 news item

commit 38721d041c19fe20ed3c5c276b2b5249c96c7e43
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Dec 15 12:37:19 2012 +0100

    On the road to 2.0.6

commit 64d151e0779388722c5cea179830e9e6c9c0408d
Author: Kelly Anderson <kelly@silka.with-linux.com>
Date:   Thu Jan 5 06:23:35 2012 -0700

    Cleanup lua script escape sequences for lua 5.2.
    
    Converting \ to %, since 5.2 no longer accepts \.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit a957114421fd2e875432e5fde0448ffc1ae60cfd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1661b7d6198b2201f938131e64d90ed8024f7f94
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Dec 11 15:40:59 2012 +0100

    Update PO

commit 9a976e6d9e574bc05b9fdb7b303a6b7b811324eb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Dec 11 15:33:14 2012 +0100

    Update NEWS

commit 2886f1761e246724551fb450316501976a3a5f93
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Dec 11 12:42:05 2012 +0100

    Fix swfdec crash
    
    Close #7860

commit b5e0afa31a3702533671b8923e181c3d5cf56833
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Fri Aug 31 02:37:15 2012 +0200

    fix use of uninitialized variable on error
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 2ee43275e3dfe528f9bc41f8520ba218487d0588)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 53637eafb95dd7994dfb429ace7cc06b9b7ac8c3
Author: Denis Charmet <typx@dinauz.org>
Date:   Sat Dec 8 01:18:34 2012 +0100

    Handle ordered editions with broken links or empty
    
    Fix #7859
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 5cd1816c41f5be3b42c2abdb7e3b31407d15d1f4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8395f3344591e8a0f4d02925fab400571ffc60c4
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sun Dec 9 12:47:14 2012 +0200

    Revert "swscale: fix aspect-ratio problem properly"
    
    These were wrong and reverter in upstream already
    
    This reverts commit 48b8119ce865cb347b44b31b84a4aac7502e4a22.
    This reverts commit ecbba65a009205196c21735eb104e3c4f5f490dc.

commit 2232acd7dbf19b92764964b1f6b001c61afcec8a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Dec 7 22:11:53 2012 +0200

    XCB/XVideo: fix memory leak
    
    (cherry picked from commit dd1ff43f888d63f9042a9a94ec6050b0523c6aa8)

commit 9cdac4d6ad55d0a7fc5da403bb5a4be1591a7def
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Dec 7 10:21:47 2012 +0100

    Updating translators

commit 1adbba95d66f3d6dd456e2759685455f34ae7b39
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Dec 7 01:18:26 2012 +0100

    NEWS: l10n updates

commit 3730c2d243ecca197efb3c9b3fb66bad9bbbc2d4
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Dec 7 00:55:40 2012 +0100

    Fulah should be selectable now

commit 4dd2cad967076ff634a209ef4540f2844747ef27
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Dec 7 00:45:30 2012 +0100

    l10n: adding Interlingua to LINGUAS

commit ddeff86fcfa1dc0069fb2b014e980056bde29865
Author: Emilio Sepúlveda <emisepulvedam@gmail.com>
Date:   Fri Dec 7 00:44:08 2012 +0100

    l10n: Initial Interlingua translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit e02127136999643735a847ab5b567afa1fa7d7f0
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Dec 7 00:37:57 2012 +0100

    l10n: adding Welsh to LINGUAS

commit d5b9ce0dd1a9274bac48716efbbfe9fdae6823ee
Author: Huw Waters <huwwaters@gmail.com>
Date:   Fri Dec 7 00:36:23 2012 +0100

    l10n: Initial Welsh translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 98ed53293f534573928cae6f06be84f8e4c6fffa
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Dec 6 17:05:57 2012 +1100

    macosx: fix crash when re-ordering playlist items
    (cherry picked from commit a0442893663ac58aa5b5e8cb098951a0aa499878)
    
    Conflicts:
    	modules/gui/macosx/playlist.m

commit f755a2554e0180214eab8fb6c840a07534609116
Author: Frank Chao <frank0624@gmail.com>
Date:   Thu Dec 6 23:30:29 2012 +0100

    l10n: Traditional Chinese update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 99b7ef633d7808d0d2376644a1d7f628e998caf3
Author: Thanakrit Chomphuming <jernghan@gmail.com>
Date:   Thu Dec 6 23:23:20 2012 +0100

    l10n: Thai update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit dedccd486f511804f95119760e21e077e569e8f7
Author: sreejith p <sreejithpro@gmail.com>
Date:   Thu Dec 6 23:10:08 2012 +0100

    l10n: Malayalam update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit d6614083407e8cf97d326afbc6723c40f921341a
Author: Khoem Sokhem <khoemsokhem@khmeros.info>
Date:   Thu Dec 6 23:02:44 2012 +0100

    l10n: Khmer update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 727009ae5830013fb0676e79f489b33d9aadf6f6
Author: Vincenzo Reale <smart2128@baslug.org>
Date:   Thu Dec 6 22:36:25 2012 +0100

    l10n: Italian update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 1c3b012f2c7fe061563fe067609ca69f233a20e4
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Thu Dec 6 22:29:04 2012 +0100

    l10n: Hebrew update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 900f226c551950f0e11c3e613dfb43df89ddb6b9
Author: Michael Bauer <fios@akerbeltz.org>
Date:   Thu Dec 6 22:25:58 2012 +0100

    l10n: Gaelic, Scottish
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 117eea84c92f0ca3b216e7419e1c874f169521a9
Author: Ivar Smolin <okul@linux.ee>
Date:   Thu Dec 6 22:22:12 2012 +0100

    l10n: Estonian update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 614ff5993766ac102c486384e8c74f1dd2a14d25
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Dec 6 23:31:54 2012 +0200

    PulseAudio: force minreq to less than half tlength (refs #7827)
    
    This should work-around distorsion due to excessively short latency
    computation in PulseAudio, e.g. NVIDIA HDMI Audio.
    
    In the longer term, VLC should probably set minreq to 40ms and tlength
    to a larger value or even -1. But that would require more testing.
    (cherry picked from commit a1ddda85bb3cbd7ec4b7bb0aa0fd80c9a6d3afe7)

commit 6556052f8a17db51860e39a4c57b992e794532a9
Author: Tomáš Chvátal <tomas.chvatal@gmail.com>
Date:   Thu Dec 6 22:14:41 2012 +0100

    l10n: Czech update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit bac0b53c681e7af29bf7d0a8c19cd6d93382dfc6
Author: Adnan Memija <sream_92@live.com>
Date:   Thu Dec 6 22:11:18 2012 +0100

    l10n: Bosnian update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 8e348871c782f1faa9e4195105b959b7f56c5e68
Author: Biraj Karmakar <brnet00@gmail.com>
Date:   Thu Dec 6 22:04:23 2012 +0100

    l10n: Bengali (India) update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit b98c9c8c943a77cb33e7c5eb95ad2b2dabd5c73f
Author: Iñigo Varela <ivarela@softastur.org>
Date:   Thu Dec 6 22:01:25 2012 +0100

    l10n: Asturian update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 8b4334bdd08beb2e64d07b2b92b863f883f63231
Author: Dominko Aždajić <domazd@mail.ru>
Date:   Thu Dec 6 20:57:07 2012 +0100

    l10n: Croatian update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 263dd77ea5425866f4d827a282b0a4626fa62528
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Dec 6 18:32:42 2012 +0100

    Qt: fix toolbar customization when doing back and forth
    
    Close #7543
    (cherry picked from commit 22faed61d33d747226e5238466c30b56a9fec4f3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 81a328447337174bb0aac581f9f560205db741d9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Dec 6 11:59:45 2012 +1100

    macosx: fix display sleep issue on 10.5 (refs #7623)
    
    According to user reports, the modern IOKit approach doesn't work on 10.5 eventhough the docs state that it should.
    
    Note that the screen (and it turn the device) will fall asleep after the defined time in system preferences when playing audio-only media on 32bit devices running 10.5. This is the way it used to be in the past anyway. For x86_64 devices or 32bit devices running 10.6, there is no change.

commit 113cbbcda68316362273f5b85db1f91ee964483e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Dec 6 10:26:30 2012 +1100

    macosx: fixed race condition crash when closing the vout
    
    vout_display_opengl_Delete will call OpenglLock, so it is a bad idea to previously release sys->glView
    (cherry picked from commit c6a264bf022d834e7617948e4923012fc1d8369d)

commit 54316e0185b52ee07d89e3e38d3f30190fc11376
Author: Kaya Zeren <kayazeren@gmail.com>
Date:   Wed Dec 5 21:38:54 2012 +0100

    l10n: Turkish update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit b3cf89cbe016d968acb198528c2406f932461ce7
Author: Michał Trzebiatowski <hippie_1968@hotmail.com>
Date:   Wed Dec 5 21:34:12 2012 +0100

    l10n: Polish update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 4c7688bdd438989f609976728d11368f7dcd56d4
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Wed Dec 5 19:50:34 2012 +0100

    Updating AUTHORS from git log

commit 3a1de5413ae0b61112d6dcde9e88f12c8c30b195
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Dec 5 12:12:30 2012 +0100

    Contribs: possibly fix encoding in audio
    
    Should close #7804 #7692 #7748

commit e884176085b697fdf2cbe92a63021ad79d5976ad
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Dec 4 16:22:36 2012 +0100

    Revert "Correctly detect alac in mp4 properties"
    
    This reverts commit e45858ce2292b640858fe45d87ac436e92a17edc.

commit ec0a0dc4cb91c78e0b289053aa470cb4cecde1c7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Dec 4 16:18:53 2012 +0100

    NEWS

commit d3b9e46799d59971da60fce978f7a1a6fc2e6809
Author: Ask Hjorth Larsen <asklarsen@gmail.com>
Date:   Sun Dec 2 23:07:46 2012 +0100

    l10n: Danish update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 75d6191245915b05a8e0386158dee3be1abb57dd
Author: Marián Hikaník <mhikanik@users.sourceforge.net>
Date:   Sun Dec 2 20:57:09 2012 +0100

    l10n: Slovak update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 54f609fe25734e858c978e55ca201e226d88187a
Author: Dean Lee <xslidian@gmail.com>
Date:   Sun Dec 2 20:53:21 2012 +0100

    l10n: Simplified Chinese update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 3d888ad6a63fcdccd7c5af25e3c48b1b1ca2d942
Author: Sidney Doria <ssdoria@gmail.com>
Date:   Sun Dec 2 20:48:01 2012 +0100

    l10n: Brazilian Portuguese update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 884916c95c265a8a9f11f631508cfa180a508daa
Author: Thomas De Rocker <thomasderocker@hotmail.com>
Date:   Sun Dec 2 20:33:07 2012 +0100

    l10n: Dutch update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 17da6cc3911dc205b660d3468852c65563e657c4
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Sun Dec 2 20:27:22 2012 +0100

    l10n: Japanese update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 380cad9726f1b8eb711b6e367c9f709b6f13b53d
Author: Gonçalo Cordeiro <gzcordeiro@gmail.com>
Date:   Sun Dec 2 20:24:02 2012 +0100

    l10n: Galician update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit f069a61bf29c97d6269c4526dff49e049ffe5ade
Author: Mario Siegmann <mario_siegmann@web.de>
Date:   Sun Dec 2 20:11:38 2012 +0100

    l10n: German update

commit a447be1718c2cc009490de52cb87b20c0e8922fc
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sun Dec 2 09:56:05 2012 +0100

    undo changes in POTFILES.in/skip

commit 007ddb0918530a621f434ae0c2f09593dffd57cf
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sat Dec 1 19:32:43 2012 +0100

    Update PO

commit be1bcb349e3c7d399590b5c267fb2b42f31bad24
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Nov 27 00:19:15 2012 +0200

    DBus: remove from list of "control" interfaces
    
    The D-Bus interface is always started automatically. It should NOT be
    added to --control.
    (cherry picked from commit 4ba6b7dab9fb66fce9967ed979f1b692be18a1f2)

commit 132865b38ddf65a9eb7e2d0095ca907bb55cfb9f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Nov 26 21:41:21 2012 +0100

    NEWS: updated demuxers, OSX and translations sections

commit eb872219cf72bd2b94a8a578d3fb4e014578a6ee
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Mon Nov 26 19:26:06 2012 +0100

    po: fixed typo in the French translation
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 48b8119ce865cb347b44b31b84a4aac7502e4a22
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sun Nov 25 19:13:37 2012 +0200

    swscale: fix aspect-ratio problem properly
    
    works with transform filter now too, fixes #7437 again.
    (cherry picked from commit 0330378c55b8b940f6de82adb59cc32c5b3da12a)

commit 9ccecb62f1878b6a43c2a662213e8bdf94cda0f6
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Nov 25 15:59:45 2012 +0200

    Revert "http access: advertize gzip encoding ..." (fixes #7757)
    
    This reverts commit 4087c7c0edad3db4098c02fd6003b4bb2f78aca9.

commit 329bb89097c9ae8e2c4df57748bdb63d6fdd9872
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Nov 24 22:44:41 2012 +0200

    vout: fix segmentation fault if initialization fails
    
    (cherry picked from commit 97e88867dde80bfd90e4d1c42d08bde34e1314e3)

commit 34f3f2f90f1d58f980b24c0457e70d8025e0e887
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Nov 24 23:01:38 2012 +0200

    shm: fix PTS delay (fixes #7579)
    
    (cherry picked from commit 6eaec7cb6995c4f7c7a12d3c9e9fd6b05a446230)

commit a1f6bd08356a7ab76655a54362511db6e54646c9
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Nov 24 17:49:43 2012 +0200

    dtv: fix compilation with Linux 3.7 / DVB >= 5.8 (fixes #7763)
    
    (cherry picked from commit cd1e58d9d37bc97bd4981faaa075e9d13c75bc3b)
    
    Conflicts:
    	modules/access/dtv/linux.c

commit a2d9fc18e3fdec189137d2d202519ecf998b7571
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Nov 20 23:21:59 2012 +0200

    Update NEWS

commit 80b182de0442c7e20b207f31d2af4cc4f0cceda4
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Nov 20 23:17:41 2012 +0200

    DTV: fix DVB-S autodetection
    
    (cherry picked from commit 1c858fbdf23e7bfc93bcab47193ce5100cd61e7a)

commit b4567078408b5b9144cbf76c7cabfc9f6fa64752
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Nov 18 00:05:23 2012 +0200

    DTV: use vlc_open(|at) to work-around O_CLOEXEC
    
    (not cherry-picked from 374fc686a22063c060d36582f0e90ab1a57ab33e)

commit 395d3bfc2bd75712aa28230f93d6a2c68ecd5d87
Author: Juergen Lock <nox@jelal.kn-bremen.de>
Date:   Sat Nov 17 23:49:04 2012 +0200

    PulseAudio: fix segmentation fault
    
    Reported by: Rainer Hurling
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 7751dc1fb827256b226fe49bd99fe6a5f37f5c8a)

commit 8e8b02ff1720eb46dabe2864e79d47b40a2792d5
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Nov 17 20:00:34 2012 +0200

    subsdec: really fix buffer overflows
    
    Reported-by: Aliz Hammond
    (cherry picked from commit ee86514d1cb1fe5ec25c8bdfb2a4b6a8d98591e7)

commit e5075a80e1000eca63076c8a657262feb2579e02
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Nov 17 19:55:57 2012 +0200

    subsdec: close <font> correctly
    
    (cherry picked from commit 744121f4461e064e2f26f406c64c9091c95d5e43)

commit 74ff87cc141bc1b88a38ee90f95b3d935c938a56
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Nov 17 11:04:12 2012 +0200

    FreeType: fix NULL deref on embedded fonts (fixes #7771)
    
    FT_Face.family_name can be NULL for embedded fonts.
    
    See also http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec
    (cherry picked from commit d96f6e23adfd24ec188cb2a7b31cc2e992291172)

commit 7d3eba0d4f7e2ff6072d320da02008c1317a5767
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Nov 16 17:13:02 2012 +0100

    AVformat: do not use static attachment pictures as stream
    (cherry picked from commit 89a3302c734f2195b620e1bca12670834abd18c9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e026b6eb99ee266151af0e0d057485590c873e7c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Nov 15 19:33:40 2012 +0100

    macosx: fix incorrect text shadow offset (close #7630)
    (cherry picked from commit 94d4f4a69c9c424ab1f782b6e5461a9eed16bb41)

commit c1fa23c0075c3ab928c80211029211bedbc03300
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Nov 14 12:28:33 2012 +0100

    macosx: fix crash when displaying the Media Information panel with disabled local stats
    (cherry picked from commit a44da88b77a1fe47f5e49c11106261d8b50315f8)
    
    Conflicts:
    	modules/gui/macosx/playlistinfo.m

commit 77c6906f5ce6ae3c7f99bbf7fd081b73aef9896f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Nov 11 16:13:51 2012 +0100

    macosx: fixed crash when terminating while the progress panel is displayed
    (cherry picked from commit 6c62d7475dce83cbc116f4bcc470ee4f9078e6c1)
    
    Conflicts:
    	modules/gui/macosx/intf.m

commit f1bd800ee42c8e64f8ba75366f0c20e0d3876ac3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Nov 10 22:30:27 2012 +0100

    AIFF: avoid division by 0
    
    Close #7739
    (cherry picked from commit d82327460779ea62d6debc0e08b7f57c7bf384a4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7f12d46095d394e969c422fdcb95abadc5ff0c49
Author: Daniel Peng <dpeng@google.com>
Date:   Thu Sep 13 23:49:38 2012 -0400

    Some RTSP implementations (Foscam H.264 IP cameras) return HTTP/1.1 501 Unimplemented on OPTIONS requests. Don't fail out in this case; just continue and assume GET_PARAMETERS is unsupported.
    
    I have a Foscam h.264 IP camera with a very strange RTSP-over-HTTP
    server, and I wanted to get VLC to play it back.  Here's the patch
    to VLC; I also had a patch committed to live555 to resolve a few
    other issues, and that's available in live.2012.09.13.tar.gz.  Do I
    need to submit a patch to contrib/src/live555/rules.mak to pick that
    new version up?  Or is there a special process for that?  Or should
    I just wait a little bit?  :)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 31180356048402d449f4ee765da20e67ff7e8005)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1a634ca6de7a4fa4d5b4e66fb173f264ca9291ee
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Nov 8 22:43:00 2012 +0200

    libvlc news

commit 1657da9db32ce092196c15990b8531364f444af8
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Nov 8 22:39:35 2012 +0200

    lib: correct and uniformize audio/video track IDs (fixes #7645)
    
    (cherry picked from commit 2c5ee1707b1962ee3f47dbe4abb7c199aeccc022)

commit d6f426a044c6db5d9667210b56e4361b18bf27b4
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Nov 8 19:13:14 2012 +0200

    lua: fix right OSD alignment (refs #6326)
    
    (cherry picked from commit eeb201b9b0823b88b69372ced5f674cba66a461f)

commit 14189678663a8954899595d6f0978810f27fcfba
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Nov 8 19:12:50 2012 +0200

    lua: fix "center" OSD alignment (refs #6326)
    
    (cherry picked from commit c1157eb5cc71a6c1c2210957bcc7f9cc0c744d6a)

commit beb1a09952e6cb1948305743ba210a6a7914d833
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Nov 6 23:57:13 2012 +0200

    aout: fix memory leak
    
    (not cherry-picked from f8e940016f9d710ebfafe8e3898fe591dd9c76c2)

commit 96158ea0d8a5f59ee084f92b73cef200f1289b6a
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Nov 4 00:09:08 2012 +0100

    avformat: fix use-after-free in error path
    (cherry picked from commit 50fe8e1180d012caf19d421229143344d4242405)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 3ce813b2e492c82bdac9baa69932ea816b68d220
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Oct 30 18:31:35 2012 +0200

    mkv: fix call to ES_OUT_SET_NEXT_DISPLAY_TIME
    
    (cherry picked from commit 9002730fbd83123aae1f69f162e4275f595f9f9e)
    
    Conflicts:
    	modules/demux/mkv/matroska_segment.cpp

commit 9bc5a1140817065c3908381fab17d8dfd05441a1
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Nov 1 19:47:08 2012 +0200

    file audio output: fix float endianess
    
    (cherry picked from commit d83bc62511663138a20d1a9f66b0d8a442421148)
    
    Conflicts:
    	modules/audio_output/file.c

commit 88fe9f443f75fee558bd0a9c501985e4afd8bd08
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Wed Oct 24 23:58:49 2012 +0300

    avcodec: only set min/maxrate if rc-buffer-size is set
    (cherry picked from commit 50a0ceae0ffa535512c5fd8e0952f277b1732458)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9554d1a8bb0106d4a067a70337991a67074d93b8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Oct 23 14:04:22 2012 +0200

    fix make dist
    
    reported by eartle

commit 54de66b5771226ada3133886c06e085a5c4ec169
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Oct 22 19:47:52 2012 +0200

    macosx: fixed Reveal-in-Finder for eastern european umlauts and probably other characters without a ISO-Latin fallback (close #7631)
    (cherry picked from commit bd544fff4fa8186436a2792aed375d08a82f635f)
    
    Conflicts:
    	modules/gui/macosx/playlist.m

commit d5f98e5d9231e8028ffd899e51d5a51d68060854
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Oct 18 19:34:20 2012 +0200

    contrib: dvdnav: disable examples using configure option
    (cherry picked from commit 938d93aa3d958236ff4929a2d2102557fa1d3581)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e93388af5e5e4d305bb7bb325633de8b8ae75de1
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Oct 19 16:30:55 2012 +0200

    UAC.dll: build with static libgcc/libstdc++
    (cherry picked from commit 05d0d2b0adbc21fb97bf176aa4adeadad52ae7df)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f8c5a751d4e4806eb0e449ffc83df14524c0d16a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Oct 22 11:04:05 2012 +0200

    On the road to 2.0.5

commit a4e92ec8b5ed0cd01478111a80c8f2be19503e92
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Oct 22 11:02:50 2012 +0200

    Contrib: Use a better revision for FFmpeg

commit c9472342d46edfd905b64b31521cf0ce815f66b7
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Oct 21 10:21:26 2012 +0300

    gcrypt: add SHA-256 (fixes #7627)
    
    (cherry picked from commit cf2106da2cae9ea158c2aec59ccb0c0754a8688b)
    
    Conflicts:
    	contrib/src/gcrypt/rules.mak

commit 9701837bb454c682ba5697e665d79d6e51ae305d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Oct 18 22:49:53 2012 +0300

    pulse: do not resync on suspend
    
    Suspension should not occur during playback. However, it can happen
    while the stream is starting. In that case, forgetting the
    synchronization informations is more harmful than good.
    (cherry picked from commit ac1d1616c9814e9bae1588c60bc256dc3e15508c)

commit 0554a01551ae49613062c2d96701d277000e4109
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Oct 18 22:46:35 2012 +0300

    pulse: fix start time, do not confuse first and last PTS in buffer
    
    (cherry picked from commit ce87f749aef0db130f494fb8d8e9e2653e0be4f5)
    
    Conflicts:
    	modules/audio_output/pulse.c

commit eb37e40a5660d3e65c286fcb36e48326dae0d7e1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Oct 19 11:59:26 2012 +0200

    Koreus: fix on broken pages
    (cherry picked from commit 12baf681cade7228219964d5b43fa5fc8ca2c3ce)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1b36256f114343eb13a8256859475fc46d62529c
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Oct 18 20:17:39 2012 +0200

    win32: Distribute all language files

commit 828f7ab6338996d69d23c9d651a63ed30900dae6
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 13 17:51:03 2012 +0200

    DMO: blind fix for loader compilation
    (cherry picked from commit 5444f9a081fa5cf74b49d4f40e13ea0675d115f5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit deac747db237a3995f9d27bc7050bd44b3fd9332
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Oct 18 12:54:23 2012 +0200

    Contribs: update libass to 0.10.1
    (cherry picked from commit 826ec51f9d71813ceb1447d071c848b2ae467d9f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5d6a6f0e53bb30a4a1e4a55a8d150af4e68b33ee
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Tue Oct 16 23:49:54 2012 +0200

    Make Asturian(u) selectable in langlist

commit 75129fe9ec8b450591fda4176d58d4ae333d9888
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Oct 16 23:59:38 2012 +0300

    And yet another translator that cannot read English (fixes #7605)
    
    (cherry picked from commit 17b4418856ec1cf7862f5c70f767cc8ad2f81971)

commit 5503b5d769706b042ee5c72745e49b9129e96fdd
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Oct 16 18:47:35 2012 +0300

    shm: fix capture with non page-size frame size (maybe fixes #7579)
    
    (cherry picked from commit 22203a5835c4cb44be70653c94375af309141168)

commit acff390b834f607d558969dd78e03372e1b46082
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Oct 15 21:59:48 2012 +0200

    contrib: update libav and FFmpeg hashes

commit 811b771a9bbb4fdba3f7d188c0d2568389568f44
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Oct 15 17:34:05 2012 +0200

    Update POs

commit 72da14fa2567d973b9fd8305b37a472f878a2469
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Oct 15 18:02:06 2012 +0300

    i420_yuy2: correct placement of target attributes
    
    (cherry picked from commit bd3d52ddece0d319d9c1adaf2e168e555d30ab6c)

commit 5884109823cdcb42fd49d7b681455d7b20acace9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Oct 15 15:45:01 2012 +0200

    macosx: compilation fix for 10.5 and 10.6

commit 3f82ec232bf6d840e13c3bd6fa6f692a2d1f2d43
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Oct 15 13:15:47 2012 +0200

    macosx: fixed system idle behavior on 10.8
    
    needs forward-port and testing on 10.5

commit 7e02b83ef18cb7431b9d1b822094bd7e3433e06b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Oct 15 01:07:23 2012 +0200

    Update PO

commit 2a8e8560df9843c5cef83d1f79fa74e4d6b1bd78
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Sep 30 23:46:55 2012 +0200

    NEWS: update
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 47d4631ac62900484fac206abdfc33a2920b07bf
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Oct 14 18:58:18 2012 -0400

    png: Check length before read
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b3b751cb99df71e3c0a18bcb38b4691cf98265fe)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 621a3ec29fc8d874eea4c0293e509038223b4325
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Oct 14 23:12:53 2012 +0200

    Contribs: update libpng to 1.5.13
    (cherry picked from commit 34b0ec9a540d974de8e54db85802636372260ea5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6ee30a0afb74185508f24d4523990b092fe66db8
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Tue Oct 9 19:24:41 2012 +0900

    Qt: Show TimeTooltip window without activating it on OS/2
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 5f0e2c0921d9ae4c942bfc801e421999d05d602e)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c19dcec79b9a742015d48c50c62e9954c6f72d33
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Tue Oct 9 22:41:33 2012 +0900

    Qt: Bring a timetooltip on the top on OS/2
    
    This fixes the problem that a timetooltip does not appear on fullscreen
    from the second fullscreen state change.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d473eeede4ab8b14902be07f330764f42dea181a)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 01095f123eca7cd8198d407bd8f5d2c2ad720c5e
Author: Thanakrit Chomphuming <jernghan@gmail.com>
Date:   Sun Oct 14 23:35:29 2012 +0200

    l10n: Update Thai translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit f84d7e628971b7b644b695b9f2a426fdf67982b1
Author: Adnan Memija <sream_92@live.com>
Date:   Sun Oct 14 23:22:59 2012 +0200

    l10n: Update Bosnian translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit a9499fadef7655c4f0f13f4f64b642862862099a
Author: Bruno Miguel Queiros <bqueiros@gmail.com>
Date:   Sun Oct 14 23:19:25 2012 +0200

    l10n: Update Portuguese translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit ab3b11877d4f178e760da22bcce35887dc6d9f00
Author: Ivar Smolin <okul@linux.ee>
Date:   Sun Oct 14 23:11:33 2012 +0200

    l10n: Update Estonian translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 514a5c58076ff022b92f20f33450c316d904622c
Author: Denis ARNAUD <denisarnuad@yahoo.fr>
Date:   Sun Oct 14 23:05:15 2012 +0200

    l10n: Update Breton translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit f08efb3143648b92f365fc45836aa0e1a6421f9c
Author: Iñigo Varela <ivarela@softastur.org>
Date:   Sun Oct 14 22:58:35 2012 +0200

    l10n: Update Asturian translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 6e6100aeba3da55b63677907ff01ef38c9ee1b27
Author: Tomáš Chvátal <tomas.chvatal@gmail.com>
Date:   Sun Oct 14 22:34:50 2012 +0200

    l10n: Update Czech translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 3ca77004b99acb706a1367bdea771aa93fd5d8aa
Author: Rui Zhang <bbcallen@gmail.com>
Date:   Sun Oct 14 02:02:11 2012 +0800

    http: trim trailing space in field content
    
    Fix incorrect redirection given in "Location: http://host/path "
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit a05aca783e3b2a03f839d2141ee64ee835ebf1cc)

commit b60db54c29f662012425561c68d2d700cb21fdde
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 20:47:36 2012 +0300

    Add KDE solid support for Blu-Ray discs
    
    (cherry picked from commit 75d7b6e769325346dede1310d656df73e1b99a6b)

commit d9c1c0e1b0cacab6d6e049c5aff2de166d7a23dd
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 20:44:44 2012 +0300

    Fix KDE solid predicate
    
    This partially reverts commit 99ebae0c04aa2ce0b3085fbba78f4245c713d9c2.
    (see http://techbase.kde.org/Development/Tutorials/Solid/Device_Actions)
    (cherry picked from commit 7df32e49d410253bdbcaf7c7411bde9386c459d8)

commit 7c1bc11f3fa6345ff4c10d2e1756d040440b4864
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 16:41:14 2012 +0300

    i420_yuy2: clobber MM and XMM registers correctly
    
    (cherry picked from commit 01924381fd15196a68f29d4cc279fb7a42f6f556)

commit 708e92e9022d3c0dd3a3ecc9b507113e33509efe
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 16:21:24 2012 +0300

    sepia: clobber XMM registers correctly
    
    (cherry picked from commit a865ced4888701e8caf0137672a4857c2b0d47d7)
    
    Conflicts:
    	modules/video_filter/sepia.c

commit d879cd1f604016533ec76bef6771a74c409e5e81
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 14:51:48 2012 +0300

    avcodec: avoid duplicate vlc_CPU() call
    
    (cherry picked from commit 18d7c9713c4b42368789961af6bc6345ce1fc6f9)
    
    Conflicts:
    	modules/codec/avcodec/copy.c

commit 3cdabb12389ecb273f4dc7a9368a4a34853991fb
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 14:05:18 2012 +0300

    avcodec: clobber XMM registers correctly (fixes #5268)
    
    (cherry picked from commit 485a070fcaa8e6bd7985ce489d5f53edffecfdaf)

commit 066dc71dd6a7e122db0c4010eebee2baaeee6f3d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Oct 13 14:00:01 2012 +0300

    avcodec: split generic YV12/NV12 copy out of SSE2 functions
    
    This is required by the next commit. This also avoids making two copies
    on non-x86 platforms, where USWC optimizations are irrelevant.
    (cherry picked from commit 07d8e576c7a0dcc7863d6853f620d5a99ebba55f)
    
    Conflicts:
    	modules/codec/avcodec/copy.c

commit 69eb62b3c1a53a1eec41d45707c198c65f2fa1d8
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Oct 11 19:41:53 2012 +0300

    avcodec: fix spelling
    
    (cherry picked from commit 6f5810a46adfc2e5202ebaf89b54eb89e7b93934)

commit e7f4622fb5c20d1577b90ecd1f60d964d3e18345
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Sat Oct 13 10:39:27 2012 +0900

    input: Allocate an enough buffer for UTF-8
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit f929e866e18a94b1c61b4747e56bcd2d2d818551)

commit 689e95e5c1a3e129da6f3e6a040efd22ebd13dc7
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Oct 10 18:17:03 2012 +0300

    avcodec: use av_get_pix_fmt_name(), fix potential out-of-band read
    
    Our custom codec names table lacked boundary checks and was incomplete.
    (cherry picked from commit 88846171954a218ca9c401b87b0a4faffb5fc385)
    
    Conflicts:
    	modules/codec/avcodec/video.c

commit e5d66497557337b9e7aa69ef1dd2a1a2b0f2ad01
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Oct 11 19:42:03 2012 +0300

    avcodec: fix unaligned USWC copy (fixes #6333)
    
    (cherry picked from commit 39dc439cf5e3fe83b87078bcf93c13d07fd02dac)

commit 931b79aeb154bc82749b4897a0c3d2abab454d57
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Oct 9 19:00:46 2012 +0300

    Win32: match resource character encoding (fixes #7567)
    
    (cherry picked from commit 44819779f94086ea1f21a9649af8d41754fa9ccf)

commit 0002ac1011ecadbdaad59e3a711f23063150c62c
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Wed Oct 10 01:20:48 2012 +0200

    youtube.lua: support live streams
    
    This could use a bit more testing than a single video
    (cherry picked from commit 64e30497fa764f680c2b235757e49f6c83b85028)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 21466d50b457e453ef8fb1a52a0e12a762254db2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Oct 10 12:58:44 2012 +0200

    macosx: don't initiate a modal dialog during a modal session (close #7575)
    (cherry picked from commit e608d2aa90a733e48cfc58f9be73f2aea8c75c94)

commit 8c372e6124e9526286f71571b18baa03550da82b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Oct 10 11:27:55 2012 +0200

    Subsdec: various fixes for broken subtitles
    
    Close #7553
    (cherry picked from commit 26015dacd88f21d48bdebeb499dc8f331baacc19)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 920ca4e74c95899703c13125f31e3e8c180af54f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Oct 9 19:06:46 2012 +0200

    macosx: compilation fix

commit 66162d9719168b168c9cc73de3204da986711ae1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Oct 9 18:37:16 2012 +0200

    macosx: show the localized, intended to be user-facing encoding names instead of the variable values to the user.
    
    This way, s/he is never presented an empty menu item for the default value.
    
    This also closes #7539 by preventing stringWithUTF8String calls with empty strings.
    (cherry picked from commit d7246593be4f2484d13adaaf5bd8cbd4c8e5b812)
    
    Conflicts:
    	modules/gui/macosx/open.m

commit c2b7fa23e2c3c6c5c8303ac262b59654ccfe70a0
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Oct 6 17:29:20 2012 +0200

    add black view to detached video window in order to avoid transparent or grey flashes

commit 6dd9853ccf6a886f146cd5b3ce5e3732f9eae9d4
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Oct 2 22:57:29 2012 +0200

    Revert "macosx: use black color for detached window background"
    
    This reverts commit 31c26485ebf9212d349b9b441fe3d87068abc92a.

commit 31c26485ebf9212d349b9b441fe3d87068abc92a
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Oct 2 17:41:39 2012 +0200

    macosx: use black color for detached window background
    
    This avoids grey or transparent flashes on start
    
    (backport of 568303d7e84c1cb8a66ad694ea82e5fc7b2f4d43)

commit 413ecd64f4f34cb2c8a13edc1078d932517f9876
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Oct 1 23:38:37 2012 +0200

    macosx: fixed crash due to race condition on launch
    
    The main window may be asked to update its content prior to VLCFSPanel being fully initialized
    (cherry picked from commit 8ef447a49d49598e5b022c4b2f03a3b8a6a24d98)

commit d05cf3d13ca7493bd45d4e495b91ec9b82c384e2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Oct 1 23:26:48 2012 +0200

    vout_macosx: add additional sanity checks to prevent rare crashes
    (cherry picked from commit 48fcb08c1afd28d0aec079e964805254364d8dd8)

commit 0358f72c22dc24a052dce857bf39bd07316f807a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Oct 1 22:04:20 2012 +0300

    dca: set output buffer size correctly (fixes #6509, fixes #7459)
    
    Some filters and outputs rely on the samples count (which was correct),
    others on the bytes size (which was not), accounting for why decoding
    failed only in some combinations.
    (cherry picked from commit 244a35b0301164f753a381f569181c6bd3419ad1)

commit b0255011ce7d06f323c63b85242b0fae39c39a50
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Sep 30 18:18:37 2012 +0300

    tls: poll and timeout during handshake (fixes #7533)
    
    (cherry picked from commit 2f66c69631cc461ac8619d1f14561fd13a59dc08)
    
    Conflicts:
    	src/network/tls.c

commit 299dd463f8095d443a64cf027441419db3e5a0c9
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Sep 30 17:06:31 2012 +0200

    koreus.lua: decode title and description
    (cherry picked from commit 6c5a0639e7281ce93d1b1881ba45ddc2373396ff)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 6c71e02b0523a63b67c5f7cb6304e46be35eec5c
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Sep 30 17:01:21 2012 +0200

    koreus.lua: small fix-up
    (cherry picked from commit 4491de9a6b93ac1838eaa0ef89ad97eddbcf4960)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit d10ea6d9b58afaada9e1fe2e4d61fee41af83b05
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Sep 24 15:30:34 2012 +0200

    Record: escape file names
    
    Close #7490
    (cherry picked from commit fe6e7e3d43238b85c9c2f2379410a5ea1c5c8247)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c68e9688305607133ce746869fb610da50364511
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Sep 14 08:51:22 2012 +0000

    base64 decode: stops after first invalid character
    (cherry picked from commit ce6521381bc24cda9c9ac4f54ae6e0b61bbcde53)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93b37f19b5cff53932ed034acb906e717ca2574b
Author: Rui Zhang <bbcallen@gmail.com>
Date:   Tue May 29 20:42:41 2012 +0800

    httplive: parse EXT-X-MEDIA-SEQUENCE only once
    
    refs #6897
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit 4ab81377158ece056cae3a45084f20efb5df79d7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5ecc28ae8ff0d2e390fb6e4dfdf77ba94703577a
Author: Rui Zhang <bbcallen@gmail.com>
Date:   Wed May 30 17:41:35 2012 +0800

    httplive: ignore failed stream in meta list
    
    So we have chance to try other streams instead of just fail.
    Fixes #6898
    
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit e71bbc493deae0a2f1c01ea06dbb5e51a555edbe)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 832874921b930e2a8a80defde57df555feae944a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Sep 30 17:52:39 2012 +0300

    http: correctly strip URI scheme upon redirection (fixes #6872)
    
    Quoting the reporter:
    | According to include/vlc_access.h, access_t.psz_location is "URL with
    | the scheme stripped". But in http module, schema stays there after
    | 302 redirection. That may cause httplive module try to access URL like
    | "http://http://host/path".
    
    Pointed-out-by: bbcallen <bbcallen@gmail.com>
    (cherry picked from commit 15eb1dff90131cee1244c5d2c652b07b04816d7f)

commit 8d62bd60593c2ac55e1d8afccf832bc03471e016
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Sep 30 12:29:08 2012 +0200

    Fix koreus parsing
    
    Close #7529
    (cherry picked from commit 89b1b06c5eb7a1a5a882b6dfd07d30d9250443be)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a85d2c120bc0e76c359c0e337b2225575b41e80d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Sep 29 22:51:23 2012 +0200

    macosx: expose the 'Karaoke' filter in the UI because we can
    
    Manual backport of 79a5d68775e135b0f7337d5300a03875588f459d since it doesn't introduce new strings.

commit fb7e2b90b172d7aec477025a3e72ce0de90ffc47
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Sep 29 15:16:20 2012 +0300

    gnutls: fix memory leak in error case
    
    (cherry picked from commit 38150d6e9de4d8d382149aa2e174b565958ceef7)

commit 4087c7c0edad3db4098c02fd6003b4bb2f78aca9
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Sep 28 22:32:07 2012 +0400

    http access: advertize gzip encoding if supported (fixes #7515)
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 703ecf7456a80e8c967742f9f77d9643dfc7874a)
    
    Signed-off-by: Konstantin Pavlov <thresh@videolan.org>

commit 0b9a93ff53c8f6562b81a99d2c08f795d45f2ccb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Sep 28 13:32:10 2012 +0200

    macosx: simplify system sleep prevention code to support both 10.7.4/10.7.5 and 10.5 (close #7521)

commit 51047a67bfcaad3b4bc05e4acb4f82729094b94c
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Fri Sep 28 04:15:49 2012 +0200

    youtube.lua: parse signature parameter
    
    It was in fact still there, but as a separate parameter. We keep the
    alternate API as a fallback for the next time things break, maybe.
    
    Ref #7471
    (cherry picked from commit 3a4021cfde854da79675fa67df47fc4f463f264b)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit b228a86f9635bedad324a17a8b02b5a7061e8d46
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Tue Sep 18 01:13:28 2012 +0200

    youtube.lua: add comments
    (cherry picked from commit 43db5ce6cde15260be0c3fb98964f86aa6b64595)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 276e2eb46735726eff17ecda1ead08c6001db9af
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 27 15:27:50 2012 +0200

    Contribs: update taglib to 1.8
    (cherry picked from commit 24491d22594b78ac65766db540daf2f33a950df7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f9b6461e7795adc20c12674a9430773a80579836
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 27 14:54:26 2012 +0200

    Contribs: update gnuTLS to the latest of the 2.12.x branch
    (cherry picked from commit 675443e455b833ba0fdb05206e8b414e085d874f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e07f8327b744cee6a9671833ea84a7126210ea77
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 27 14:34:06 2012 +0200

    COntribs: update to fribidi 0.19.4
    
    Yes, a release after 3 years...
    (cherry picked from commit 4e4547f4ad45f560500022932a8c2e8c63b1ffb9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 771a6648f52f24fed2b3634a1f7c108588bb6cf2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 27 14:30:57 2012 +0200

    Contribs: update tiff to 4.0.3
    (cherry picked from commit 2332198fea65aa50ea48fb7fde22b753e1e96a8f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d25cefa5e9c1f03c44322253a4b9dc5e5fa2a204
Author: Daniel Peng <dpeng@google.com>
Date:   Sat Sep 15 00:58:09 2012 -0400

    Update to 2012.09.13 version of live555.
    
    This resolves two issues with playback of RTSP-over-http streams from Foscam h.264 IP cameras.
    Combined with a small fix to modules/demux/live55.cpp, VLC now plays 'rtsp://hostname/iphone/11?user:password&' from Foscam h.264 cameras.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b2fafcee354efb6b49686307da632999f158f72c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6ed46c53cd247021c762984905a2c5da8aeb7066
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 12 13:02:30 2012 +0200

    Contribs: fix lua.exe generation
    (cherry picked from commit 6cdaecdb6a12afbefd4448dc0dba3d89f416d720)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bcf2868a5f9248a89043587871579f8c731f9fff
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 26 12:13:14 2012 +0200

    Contribs: update sha1 (again)
    
    Close #7426

commit fb32a825dc64c7586c78eaadbbac394e76737f36
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Sep 25 22:45:20 2012 +0200

    macosx: implemented pressed state for the effects button (dark UI) (close #7408)
    (cherry picked from commit 2f747cb43fc664c5cb180e8fc92bdd78510d277e)
    
    Conflicts:
    	extras/package/macosx/vlc.xcodeproj/project.pbxproj
    	modules/gui/macosx/ControlsBar.m

commit 92c08ecd6c15aaaba9939da6cdf3efebfb579205
Author: Damien Erambert <damien.erambert@me.com>
Date:   Tue Sep 25 22:42:31 2012 +0200

    macosx: added pressed state artwork for the single effects button (dark UI)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 8fec38bc36d5e7899a6e1a70cb016697c042cf65)

commit e43cde9a0f7880d6d2b8e8c2032eb8e3ea5e5fbf
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Thu Aug 16 22:56:20 2012 +0400

    Contribs: vpx: add patch to fix build failure on OSX 10.8.
    (cherry picked from commit eba83a2a77b7896eb6b2fd90ec9fb1f20da0e966)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 66555eb0d7a4cd20f4890b239bd75f6e315f86bd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Sep 25 20:56:13 2012 +0200

    contrib: fixed libvpx compilation with Xcode 4.3 and later
    (cherry picked from commit a26c0ae3ec1609f95a39768f8c06802aa59a2d98)

commit 12eca33f3dd17a9778d8349a09d9922812a68ca8
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Tue Sep 25 21:32:03 2012 +0200

    Updating AUTHORS. Still to do: the translators

commit 1decef1daee34d07e39fe3bba34729650edfea99
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Sep 24 16:10:21 2012 +0200

    Contribs: update FFmpeg/Libav sha1
    
    This fixes most -mt deadlocks and size-change issues, except the
    H264 change
    
    Close #6579 #6533

commit a15bac03820adae2bcc43c92b4f702f86e79af0c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Sep 19 11:36:43 2012 +0200

    auhal: add callback for changes in supported audio streams
    
    This tries to fix wrong behavior when optical cable is unplugged while spdif-output is running.
    
    Currently, you will probably hear pops and you only get sound from internal speakers,
    after you changed system volume.
    (cherry picked from commit bdf858dae3bd2c81ceb2082b4c3ac36d2712d612)
    
    Conflicts:
    	modules/audio_output/auhal.c
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 748335b8305153872a2147042fe392a0ea1addd0
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Sep 18 20:26:18 2012 +0200

    NEWS: clean the OSX stuff a bit and fix translation formatting

commit 395563290e7ddbe255cd1656936f96a6755e53fd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Sep 18 19:01:37 2012 +0200

    NEWS: fix typos and unify English locale

commit c7f64b557f510ed77a31e3700a7e7a2c99a35f32
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Sep 15 21:33:05 2012 +0300

    avcodec: disable threading by default
    
    Threading does not currently work with some codec profiles and is thus
    not suited as default. Threading is also known to deadlock in certain
    circumstances, such as if no data is ever received (a rather common
    scenario with network or DVB reception).
    
    Fixed avcodec version should be checked before this is re-enabled.
    
    Acked-by: Ilkka Ollakka <ileoo@videolan.org>
    (cherry picked from commit 8d59ba01d33c96d61db5e0e7ab9b8a30b052ebab)
    
    Conflicts:
    	modules/codec/avcodec/avcodec.c

commit 116503fa01f141c585b7fd095d44ce222f262ccc
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Sep 18 12:42:50 2012 +0200

    Update NEWS

commit 99782f407f2e6bbfcc6648b292e05a6cc91569e9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Sep 18 11:58:23 2012 +0200

    macosx: work-around a playlist core limitation, which doesn't allow the UI to set the currently displayed root properly, so triggering a play can lead to unwanted results (close #7484)
    (cherry picked from commit 722c751deddeb6106ed18e379a1364ed85cd2f86)
    
    Conflicts:
    	modules/gui/macosx/CoreInteraction.m

commit 31407937e97d85e2d9fc7951c3ce6f79db5788b1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Sep 17 14:54:58 2012 +0200

    Update NEWS

commit fb582ac189bfee34b9b98196d104fde216472d99
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Sep 17 14:00:11 2012 +0200

    macosx: implemented pressed state for the effects button (bright UI) (refs #7408)
    
    Manual backport of a38092cd83d85fe232a18b1e3c4581440043b742

commit f2e3d2110e978ec7b554b3e9cf86f30dbae5880f
Author: Damien Erambert <damien.erambert@me.com>
Date:   Sun Sep 16 16:24:01 2012 +0200

    macosx: added pressed state artwork for the single effects button (bright UI)
    (cherry picked from commit 17bf09b0790a14908461b5a58b16b6e9b5f74036)

commit e61eea31cb6c68dbd41103bdd6cfd2892d8d57dc
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Sep 17 13:54:09 2012 +0200

    extras/package: added another script to sign the Delete Preferences script (close #7293)
    (cherry picked from commit 1e861aad8ed1fc551f9884a025376d80ecd7be9f)

commit 68286300eba339ab8e61221c213383012ce274f1
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Mon Sep 17 05:54:59 2012 +0200

    youtube.lua: use alternative API URL
    
    It seems that the normal URLs included in the web page miss a
    "signature" field and return 403 errors now. This approach has a number
    of issues, it requires an extra HTTP request, still seems to fail due
    to lack of signatures, and have different access restrictions than the
    the web pages.
    
    This shall meet the popular demand for now.
    
    Closes #7471
    (cherry picked from commit aaf17f6592d2cf8f122ed6d9291a8eadb4812576)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cfcfc2b4a7e5d5f0fbbd0305db1fe50b1618c44a
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sun Sep 16 22:45:00 2012 +0200

    i18n: adding bn_IN (Bengali India) and gu (Gujarati India) to LINGUAS

commit 7e96b86e949b0fda92cea6eceea7b2dec7e0cb56
Author: Stian Jørgensrud <stianahj@gmail.com>
Date:   Sun Sep 16 21:53:58 2012 +0200

    l10n: Update Norwegian Bokmål translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit f854eec844e42aab27c901b3803a1e6974fc399f
Author: Biraj Karmakar <brnet00@gmail.com>
Date:   Sun Sep 16 21:15:28 2012 +0200

    l10n: Initial Bengali (India) translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit d58b0f4d7c3b60f8d4395e2c662e02d7554fefed
Author: Ibrahima SARR <ibrahima.sarr@pulaagu.com>
Date:   Sun Sep 16 21:12:54 2012 +0200

    l10n: Initial Fulah translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 6994f0ddf0f9a1724daa760ce3c352bd483162c0
Author: Goswami Hardikpuri Kishorpuri <geniushkg@gmail.com>
Date:   Sun Sep 16 21:10:48 2012 +0200

    l10n: Initial Gujarati translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 1d71e7228ca4a73cc3a8fbcb73fa56c455e726f9
Author: Adnan Memija <sream_92@live.com>
Date:   Sun Sep 16 21:07:25 2012 +0200

    l10n: Initial Bosnian translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 1fa600a31c6230ff9af3bfd4d7ccac7325dba216
Author: airplanez <airplanez@gmail.com>
Date:   Sun Sep 16 21:02:13 2012 +0200

    l10n: Update Korean translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit b770b51f691e2a003e965168a37df519d32aac17
Author: Marián Hikaník <mhikanik@users.sourceforge.net>
Date:   Sun Sep 16 20:52:08 2012 +0200

    l10n: Update Slovak translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit a0ab73004527daca2d4c526a992cfa0340eadac0
Author: Predrag Ljubenović <predragljubenovic@gmail.com>
Date:   Sun Sep 16 20:40:39 2012 +0200

    l10n: Update Serbian translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 72db97b55c1d1fd8ba4496fa63371cdfccb2d284
Author: Alexander Lakhin <exclusion@gmail.com>
Date:   Sun Sep 16 20:37:51 2012 +0200

    l10n: Update Russian Chinese translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 2f84be55d7989cd6fceb13475aba7f2095e991b9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Sep 16 20:11:05 2012 +0200

    Qt: fix association crash on XP
    
    Close #2246 #4424 #7431 #5377
    (cherry picked from commit f447119e42aa353b18f8ba96ff6a52af363f8a3e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit feea6387cd40a6a09887e0c2d8dad6e1a3eb1f66
Author: Frank Chao <frank0624@gmail.com>
Date:   Sun Sep 16 19:52:37 2012 +0200

    l10n: Update Traditional Chinese translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit f4b638d37b0f3a023f63d5c05f4e717bdf1faff7
Author: Dean Lee <xslidian@gmail.com>
Date:   Sun Sep 16 19:51:47 2012 +0200

    l10n: Update Simplified Chinese translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 03f8c2dc0572df07c0914f1c3448d5e7a88d36ad
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Sep 16 20:42:15 2012 +0300

    po: correct default encoding for Hebrew subtitles (fixes #7474)
    
    (cherry picked from commit f2d861c7341f75ee223b7859c6960d10bafdd1bf)
    
    Conflicts:
    	po/he.po

commit cf8f5f522c6e3ac29cbc74d808008a2461340eb9
Author: Bruno Miguel Queiros <bqueiros@gmail.com>
Date:   Sun Sep 16 19:31:07 2012 +0200

    l10n: Update Portuguese translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 32cb6bc1adacf439fa599a1583fd3dd5247a81d8
Author: Gaëtan Rousseaux <gaytan@skynet.be>
Date:   Sun Sep 16 19:23:21 2012 +0200

    l10n: Update Walloon translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 64aa2bceebdfa3ba151b911f4569575c8ca80a21
Author: Kaya Zeren <kayazeren@gmail.com>
Date:   Sun Sep 16 19:16:33 2012 +0200

    l10n: Update Turkish translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 84823069d0117d85ca1f80a0bade27d62339dbad
Author: T. Chomphuming <jernghan@gmail.com>
Date:   Sun Sep 16 19:13:06 2012 +0200

    l10n: Update Thai translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 7cc190bf7acdef71f0eba22897a5552ee970fd60
Author: Michał Trzebiatowski <hippie_1968@hotmail.com>
Date:   Sun Sep 16 19:08:32 2012 +0200

    l10n: Update Polish translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit b2d32dca4835c62b903dec349dbb9240b0a96c99
Author: Thomas De Rocker <thomasderocker.at.h0tmail.d0t.c0m>
Date:   Sun Sep 16 19:05:36 2012 +0200

    l10n: Update Dutch translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit aae659eef470846764fe3fec1802685eecaad665
Author: Khoem Sokhem <khoemsokhem@khmeros.info>
Date:   Sun Sep 16 18:46:02 2012 +0200

    l10n: Update Khmer translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 05a8bb97241ef96fe86b154776652f5eccdd8e3e
Author: Gaurav Kumar <aavrug@gmail.com>
Date:   Sun Sep 16 18:38:32 2012 +0200

    l10n: Update Hindi translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit df08a519bbfc33042d18d601d0ced35fbb5ede9d
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Sun Sep 16 18:28:23 2012 +0200

    l10n: Update Japanese translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit f5a307c05f22455367e6c4e331f3e3526815e0a6
Author: Gonçalo Cordeiro <gzcordeiro@gmail.com>
Date:   Sun Sep 16 18:25:18 2012 +0200

    l10n: Update Galician translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit e8c3d3ac2730812a0cbf2bd8eac71f6489c1593f
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sun Sep 16 18:07:14 2012 +0200

    l10n: Update Hebrew translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit a4c73fed9e57d0e8f1f7466d15cfb4b638490d3b
Author: Mario Siegmann <mario_siegmann@web.de>
Date:   Sun Sep 16 18:02:45 2012 +0200

    l10n: Update German translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit ed541de0a05e7eb0b776ca19f341c697fef5c4ea
Author: Denis ARNAUD <denisarnuad@yahoo.fr>
Date:   Sun Sep 16 17:54:15 2012 +0200

    l10n: Update Breton translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 6d36d3383460f7842c3ccaea3e875f6407650e38
Author: Michael Bauer <fios@akerbeltz.org>
Date:   Sun Sep 16 17:52:57 2012 +0200

    l10n: Update Scottish Gaelic translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 32b805c26d2fd1bbc08e131cba9acdc60e5600eb
Author: Tomáš Chvátal <tomas.chvatal@gmail.com>
Date:   Sun Sep 16 17:50:22 2012 +0200

    l10n: Update Czech translation
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 0482cd9b612ef7207ee9eae269ff83889e63213e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Sep 15 14:03:39 2012 +0200

    Qt: fix album Art update
    
    Master and branch have diverged a bit more than I thought, on this
    matter.

commit c147f2db1988f1f25f8c96c0a67de396322a0296
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Sep 14 23:56:32 2012 +0200

    Qt: set the cover art (if any) at CoverArt widget construction
    (cherry picked from commit a065e2d9a53b78037f99fa120bf2600aaaac2b85)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f7b388cde2037d006d69d551039f398851ef1d4e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Sep 14 00:02:06 2012 +0200

    Package the .zip as a minimal installation
    
    Remove stuff that do not make sense for a portable folder
    (cherry picked from commit cd641aa27f82e65be670f062b6dcc78ae4f05d93)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f21936168e045fd3d5c9c118255c390d5f66813f
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Tue Jul 31 15:03:12 2012 +0200

    l10n: Use translations of help messages
    (cherry picked from commit 72645d4fc730e63160be468bcb13b056a1ce93f2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cfd1e8c8f47b984a7abe5a40b6027a4d87e92d99
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Sep 13 16:38:36 2012 +0200

    macosx: fixed inconsitent menu label based upon existing string

commit 8ccb4f6d3a473ba06760dbdb25642d8ac7cf6f9f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 13 17:37:18 2012 +0200

    DMO: fix MSS1/MSS2 decoding
    
    Close #750 too
    (cherry picked from commit fb6b324887a427a9eb5ef92bed1fa2e8129d7923)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e9ec733b0b3f7ab0d8361c74bbc137616e42175a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 13 17:36:36 2012 +0200

    DMO: support more DLLs for MSS1/MSS2
    (cherry picked from commit ca86537cc3ca180b0325195a7a4bff2c05ce608e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit adf11a53000ca3e47df9f20129a334ba18c8f1a4
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jun 24 23:47:02 2012 +0200

    DMO: use VLC_CODEC_*
    (cherry picked from commit df878fa04342c1b0ae5a47f4171d233460de0770)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b0beb35351b9059f41db8e1d905378dd83dcd7a8
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Wed Sep 12 15:15:15 2012 +0200

    lua soundcloud: fetch artwork
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c163f06ea04ec085539d517749f442746644c0e5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 491520518e91b2b8334f8d1fa586bc0c41db2168
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Tue Jul 10 13:23:22 2012 +0300

    avcodec: set rc-buffer-size to 0, as it is default in ffmpeg/avconv
    (cherry picked from commit 1d981d16b744b000414cd5a2cc38db90d26d3903)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 82c1c6abb3e04af9eafae9c0b5a2c6f757c7f929
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Tue Aug 14 16:00:41 2012 +0300

    livehttp: allow segments to be 10% shorten than asked, seems to be usual limit of allowed variance
    (cherry picked from commit 58dfd2dc56fbc91398076728d6bea3c311b1ba4b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3ef0d251441325329bce6b80b8f7bbcd37a81d6e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Sep 13 01:44:40 2012 +0200

    macosx: added support for the OPUS file and MIME types
    (cherry picked from commit ad8a5ba270d059e60ad49ea46246d435ed73732b)

commit 81f72332bc334ea09da26fad5026c76f76591a45
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 12 22:37:57 2012 +0200

    Contribs: update to the Opus release 1.0.1
    (cherry picked from commit 0f4a8e79a31a319feb400f1bdab6cb6169d6d52f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7990ac15742d6fc4ab79e0b86df4be9fc66d3c48
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Wed Sep 12 22:00:43 2012 +0200

    vimeo.lua: fix error case
    (cherry picked from commit 2e5c5442c8a604bd4446dc64a84f82b2426af80f)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit ffab21f8bf687c145b8dbe8ecdb58c199d96b3d0
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Wed Sep 12 21:50:07 2012 +0200

    vimeo.lua: remove useless test
    
    This was only useful when we had several URLs to handle
    (cherry picked from commit 5e374e0a6748ad6a8d0616a43903ad8e53edc801)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit c827b4b4df3df2f97392b969ba3386e6926c90f9
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Wed Sep 12 21:09:52 2012 +0200

    vimeo.lua: remove tabs and debug output
    (cherry picked from commit ecddf0b63594b62dfb6c89c0a73ccf669f1f581b)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit c5c797b17db364111c934908d963d29a244236c9
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Wed Sep 12 01:04:19 2012 +0200

    doc: install libvlc samples in proper subdirectory
    (cherry picked from commit 9cd19ad5d3daad87b4ec25a0a1c3bfdec31ff043)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 48752f027dc9261a1fa40926301ab3b08d7bf50d
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Tue Sep 11 23:45:15 2012 +0200

    Update changelog rules to 2012
    (cherry picked from commit b995c7405e4580cbdc8c93e056c1561f3158e1ef)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 2e97a1bf4e545cd37a778aae90c1706c798b1e10
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 12 17:30:58 2012 +0200

    Update NEWS

commit f7fae015212800dd2f3aa89a5a9fb6e75ccb75ea
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 12 15:36:58 2012 +0200

    DirectSound: fix setting the default channel in surround cases
    (cherry picked from commit a22323f27dfb09f467128be336dc4980d61898a9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 73e2c2667134df6a12e24fca1e8115dc9e394f84
Author: François Revol <revol@free.fr>
Date:   Wed Sep 12 11:40:01 2012 +0200

    lua vimeo playlist: Remove trailing tab
    
    Signed-off-by: François Revol <revol@free.fr>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f332caaf5285d8f839063c9bbf6779d2252f497c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0dfe0525b0eaa17742acedb448bbd04edff26330
Author: François Revol <revol@free.fr>
Date:   Wed Sep 12 11:40:00 2012 +0200

    lua vimeo playlist: Handle VP6 and VP8 codecs
    
    Check which codecs are available instead of asking blindly for h264.
    
    Signed-off-by: François Revol <revol@free.fr>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8e60ce57f9be6ccad2248c57f40dc9b364da09e7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 11319bfaf5f368bdbf9872531070b3207534a586
Author: François Revol <revol@free.fr>
Date:   Wed Sep 12 02:38:55 2012 +0200

    lua vimeo playlist: Use new vimeo API
    
    The moogaloop flash urls are not valid anymore
    Use the html5 API instead, which gives mp4 files.
    
    Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
    (cherry picked from commit 864864122b1a805345dd8b8dea570bf7f5c97555)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7dfeacd5e9cb50fe5f39300a763445385a0b9541
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Sep 11 00:15:06 2012 +0200

    Win32: compile correctly UAC.dll
    (cherry picked from commit 4b95124b5f832861294c18c4e3cfb377d6f72636)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d9ad3782b8bc1e651c8f574832ab6ee9996297c6
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Sep 10 19:36:14 2012 +0200

    Qt: fix a crash when using the skins
    (cherry picked from commit 7a216cf685a834d038da9b474271687167c10441)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6044d094ec6e73d0364718dbea47ca3378c8ea7e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Sep 10 16:58:33 2012 +0200

    Qt: do not delete parented QDialogs
    
    Ref #7431 #5377
    (cherry picked from commit a2df1797f9b6b39fcb8eeb3f0d616e9713b065c5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e70940c36006b3f7c98567ea02557891c89e16ed
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Sep 10 17:09:02 2012 +0200

    Qt: selector, prevent some podcast crashes

commit ecbba65a009205196c21735eb104e3c4f5f490dc
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Fri Sep 7 18:03:00 2012 +0300

    swscale: pass/calculate sar-info, should fix #7437
    (cherry picked from commit 0f233f4980d0440b8357de629fee7fa0741c27b3)

commit 31f1c24b125a19b096119fc843660dee3ffd0650
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Sep 7 16:13:32 2012 +0200

    macosx/wizard: allow partial extract values to be entered in a sane manner (close #4991)
    (cherry picked from commit 38faa0be67f7df1fa4eca218aa63782e66d7806c)

commit 6189b30c7d994c522eb151ae7adb21c8ebb7cb69
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Sep 7 15:59:59 2012 +0200

    macosx: revert recent wizard optimizations, since these led to undefined results with this unmaintanable code (close #7334)
    
    This commit is part of the stable branch only, since the wizard will be removed for 2.1.

commit 92df5c7d8b99007ce4946938f6b818c77fe9e89d
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Apr 2 18:58:30 2012 -0400

    Update update status files URLs
    
    - add a win64 file
    - do not repeatedly define the constant part
    - use the test URL on every platform using --enable-debug, not only win32
    (cherry picked from commit 87cfa6dd719667aa1b52f09ef242832b830b6a4f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9735a6b25e6b9e04b90dc19468b2b154ddb9f948
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Fri Sep 7 12:56:41 2012 +0200

    ogg: fix computation of vorbis stream length (close #1859)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 2a19f53cfef8183170cb32be9bb84d7b07a7837b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4574b1504af7881228905e668e4fa8b23748b6cb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Sep 7 12:36:51 2012 +0200

    Forgotten mem.h inclusion

commit cd5bc6d3d99836843e8842a63854bb3d3f930cfe
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Sep 7 02:08:24 2012 +0200

    po: Remove duplicate message definitions
    
    The fixed typo generated a new string, and left the previous
    string in the .po
    Fixing the .po files thus left us with a duplicate string
    (cherry picked from commit 12b67927e9f6eb49175108dab1f6720e8a6c6302)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 28b81e881c4ba068dd085585ddc9e67e3df50341
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Sep 7 01:28:24 2012 +0200

    typo: overriden -> overridden
    (cherry picked from commit f41f46f8683b8b886a9d207074f0b6d0c4e2af1d)
    
    Conflicts:
    	po/fr.po
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit d94355ae6fdfd0197c17b24bfdf7d97c07be08c2
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Sep 7 01:20:43 2012 +0200

    Typo: bandwith -> bandwidth

commit f5b95a382e9f61b3ce1718719ed7c6c6c879686b
Author: Benjamin Drung <bdrung@debian.org>
Date:   Fri Sep 7 01:13:27 2012 +0200

    Fix typo: bandwith -> bandwidth.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 07156e7ec213f474570235b9935a9fbb270e2ece
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Fri May 11 20:12:29 2012 -0400

    src: Fix typo
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a7ceba8e9dc9b8e55ea520088b554feb23861de2)
    
    Conflicts:
    	src/libvlc-module.c
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 6cb68abc190a4179f47e837c393ef46f6d11c2fd
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Thu Sep 6 12:38:49 2012 +0200

    ogg: find the length of an opus stream
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit bc6a86c077196e8a48230f37e43a9167cadf97ef)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit ae71018bdd17445101a22699e2b2a7cb41050f24
Author: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
Date:   Wed Aug 8 22:32:54 2012 +0300

    oggseek: Reset stream after searching for the last frame
    (cherry picked from commit 78a8771f4c69bdb2080a06f8b0c8db4d5675f6b9)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit a93776b5948909b259f16bb168b1171249d7ecd4
Author: Benjamin Drung <bdrung@debian.org>
Date:   Thu Sep 6 15:07:22 2012 +0200

    Do not ship UAC.dll in source tarball.
    
    Close #7436
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit aff4cad782e0939afc520f82735ebfac27cd3b9c)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit df646e716ae4715e0d34fb72d963bd430ba11b5d
Author: Benjamin Drung <bdrung@debian.org>
Date:   Thu Sep 6 14:15:43 2012 +0200

    Fix typo: bandwith -> bandwidth.
    (cherry picked from commit 4afbaf587d11e0df32e035309cb7425f754b02c5)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 42d00957d8c69ad4d80b795dde05283236c7546e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Sep 6 16:52:53 2012 +0200

    Explicitely include libavutil/mem.h where needed

commit 4a9cc6137e0a5ecca065652cda40e71597452d7f
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Sep 5 12:57:38 2012 +0200

    contrib: build opus by default
    (cherry picked from commit 621a5ee08b78d51876ca44c04c2c251f24f7c425)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1a7c66e510cd818b2ae604b29385be67a4a8ba59
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 5 00:24:19 2012 +0200

    Update NEWS

commit 1ce7158d1f45aa4059704ed467e5df3e3f71750a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Sep 5 00:01:32 2012 +0200

    Contribs: update Opus to 1.0.1-rc3
    (cherry picked from commit fbe2c9bcf9424fa6cf510257f92c739e2f1d43ad)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2d582b6e64c33c1f1be335d56224c4d75f57ed72
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Aug 6 17:50:44 2012 +0200

    contrib: add opus
    
    (cherry picked from commit 3e954c9811e72ef7486be92723bb96f7e5b4af06)
    (cherry picked from commit 0f82e032376e3d03f11530745ca4047195d3ba2c)
    (cherry picked from commit f559e33ca77317b9c43630bdaf5484ef419fb757)
    (cherry picked from commit 67b2f035a8e602c266c9b20f0a48ab8f399b538b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9f55fe99ad419230b59145bbab4e37621a8b3fdf
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Aug 20 10:30:58 2012 +0200

    Contribs: update live555 after 8 months...
    (cherry picked from commit c98e5d95fc63c36262fa6a72475ec00ab10dc0c9)
    (cherry picked from commit ba1a4be18a0fb217ee5daa7e29f1bd968d02a1be)
    (cherry picked from commit c3977541cf1e47c39e95768a1824ad33b7496c58)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b0935f27f8d52bc99e52bffaca631bb8d63d587f
Author: Varphone Wong <varphone@gmail.com>
Date:   Sat Aug 18 13:47:07 2012 +0800

    contrib: check is dxva2api.h already exists before install
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 64aa5fae9243b27c5c29121c90a6f7739f017e49)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5d555372fa5382e461965512a79d07f1fba4b105
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Sep 4 11:25:39 2012 +0200

    Contribs: use dvdnav fork on github
    
    Bored as hell of those crashes...
    (cherry picked from commit d84b8db93bce76f078f190505226924c0c4cd3cc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 772848e811a9580e8fd702bcbf1ac70ae33bdf8e
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Sep 4 14:11:40 2012 +0200

    contrib: install .pc file for ncursesw
    (cherry picked from commit 8494d6cd31987e69dc623ed3557f653cfb1198c0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7ca6e16f0fe819a645092cd146ffd45ff5099725
Author: Timothy B. Terriberry <tterribe@xiph.org>
Date:   Tue Sep 4 00:15:37 2012 +0200

    Opus decoder.
    
    Manually backported from af4805700c96f17972ab6d3292404f9248be2b90
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 94d204fb190d0495c6382581cb40712e32548a24
Author: Timothy B. Terriberry <tterribe@xiph.org>
Date:   Sun Sep 2 15:24:03 2012 -0700

    Fix 0-byte Ogg packet handling.
    
    This stops rejecting 0-byte packets, adds checks everywhere we
    access the first byte of a packet, updates the th_decode_packetin()
    return value checking so that duplicate frames aren't thrown away,
    and updates video pts generation so the resulting frames are
    displayed correctly,
    
    Fixes bug #3416.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 9c7198eaeda34f791fd007287e4089099ed70e22)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bf83512852485a6d46b38749d5a001234b1c6c31
Author: Timothy B. Terriberry <tterribe@xiph.org>
Date:   Sun Sep 2 07:36:44 2012 -0700

    Opus demuxing fixes.
    
    This properly handles pre-skip, seeking pre-roll, and end-trim. It
    uses the i_nb_samples field of block_t to signal to the decoder how
    many samples should be returned after (possibly) skipping some at
    the start of the block (for both pre-skip and pre-roll). In
    addition, it abuses the i_length field of block_t to signal to the
    decoder how many samples to trim from the end of the packet (for
    end-trimming).
    
    This patch does not compute correct timestamps for streams which
    start at a non-zero offset (e.g., live streams joined in the
    middle), nor does it correctly compute the length of a stream. But
    neither of those things work for Vorbis, either. I'm leaving them
    for a follow-up patch.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 675072a8a6a520f79e9892e26ff3be98b069df7a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 410a101388fc980d71f199d65853004e956848ff
Author: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
Date:   Wed Aug 8 22:06:52 2012 +0300

    oggseek: Fix trailing whitespaces
    (cherry picked from commit 84dc54e0852ea57671bb67d48259d0556e9e6703)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 004f14468e5a94ea0ef38147d287ace13b02ac0b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Aug 8 12:33:09 2012 +0200

    Ogg: factorize switch for Metadata
    (cherry picked from commit 52acf910743de642a4044d8fd0b8b0b2dcd0ef00)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9fd30bf5f0321119adbdf1add47b9cfa42ed6d3a
Author: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
Date:   Wed Aug 8 22:48:32 2012 +0300

    ogg: Fix theora length computing.
    
    Fix #1859 #6983
    (cherry picked from commit e80525ad5743f2117ac89327c88c98516946f26f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5c46f9de856f2ce83bc1dbb1a0be1171f90cc8fe
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Apr 5 21:56:17 2012 +0200

    Ogg: permit attachments
    (cherry picked from commit fd94f73fff0b26bbb6465831618dc33b1f5bef3b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f6fc507540c6f7f3f11238a3e0812c9dcd931afd
Author: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
Date:   Sat Jun 30 14:54:16 2012 +0300

    ogg: Use unlikely()
    (cherry picked from commit 300b4d59e370e02af65f215789643ff09550577d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5578301cab0379400643b6b5eaeec365c4608b39
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Fri Mar 30 21:52:18 2012 +0300

    ogg: use ES_OUT_SET_PCR instead of RESET_PCR in demuxing
    
    Only difference seems to be that in ES_OUT_SET_PCR we don't
    have msg_Err showing up while playing ogg files
    (cherry picked from commit 7ed15b7180e62d9bfdc218ede60f3b5ed4c931a6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 832c7b27da19ff98ad01bcca94f2b8fbf9c3ed33
Author: Gregory Maxwell <greg@xiph.org>
Date:   Tue Aug 7 15:42:05 2012 +0200

    Ogg demux: add Opus support
    
    Modified-by: Rafaël Carré <funman@videolan.org>
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 7258c97afdf6e8209a1be5c8ce707e6040c38454)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 91ed1b12745799f62e18f93e092cfb169822ac3e
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Aug 6 22:56:03 2012 +0200

    Add Opus FourCC
    (cherry picked from commit 3f17ad711a4b073ef27bf718740eaf8913be1c68)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5aa28459cd3f678b4eb8bc474603f2faad6ec4ab
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Sep 3 18:21:13 2012 +0300

    http: fix HTTP through proxy (fixes #7417)
    
    (cherry picked from commit b68f50f1ff7dc742346fb5a1e0f888e549f0ba91)

commit f4d83b9a742e66126e4b63f5354123ac801dc161
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Sep 2 13:49:15 2012 +0200

    macosx: for sakes of simplicity, assume that OSX_LION equals OSX_MOUNTAIN_LION everywhere
    
    (but not the other way around of course)

commit 25128f37dc3a564bce8d368333d8217c7d1314e9
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Wed Aug 29 16:44:16 2012 +0200

    contrib: libass added fontconfig font search paths for OS X.
    
    On OS X, fontconfig searches font only from /System/Library/Fonts, so this patch adds more search paths to its initialization.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 6bad0899ef262508992233fb12c35578f10165d5)

commit 0401bdcdfec500db466fc875133e0890779190d2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Sep 1 11:57:58 2012 +0200

    auhal: fixed audio device configuration callback and added an additional callback to watch the used device's health (close #4834)
    (cherry picked from commit 8fbb1fd08399f3a29c0c4850bac2c03e40997099)
    
    Conflicts:
    	modules/audio_output/auhal.c

commit be1b84a5544fa80514662f44d42fe6e429807c5c
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 30 23:34:51 2012 +0300

    ncurses: rewrite configure detection with pkg-config
    
    This makes sure that the correct header files are checked and used.
    That is to say the ncursesw headers as opposed to ncurses.
    (cherry picked from commit 65d11fbb2ab3ca24a3df687b65b1837286d23329)
    
    Conflicts:
    	configure.ac

commit b0a6030279fb00d847bbaa8c54e5ed797f54c8b0
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 30 23:33:21 2012 +0300

    dtv: accept frequency as low as 50 MHz (fixes #7406)
    
    (cherry picked from commit d17ebaf154b252c794eef4326065886c5c750bf5)

commit e60b9b8f9e8e991617eba0e391a49e0e22f51215
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Aug 30 21:48:37 2012 +0200

    Skins2: blind attempt to fix a ThemeRepository crash
    
    Top crash on Skins2 module on Win32
    (cherry picked from commit 9e76fdbc6e1e1243c59126688f23141329f10461)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7c8485c5eff2f1568ea6a4d2cde5b54c93b68d79
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Aug 29 14:21:24 2012 +0200

    Build contribs with debugging symbols
    (cherry picked from commit 691b9c33ec4991bfaeb91eb5afb97aee30d02f13)
    (cherry picked from commit f19d35a1efbe3f0da445f30d594c11d129d5bc26)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit be0e5b9bdb88bca67dae52f8b3afc27c4f67fee5
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Wed Aug 29 20:10:25 2012 +0200

    audiobargraph: fix memory leak.
    (cherry picked from commit 6633ef04bdbcd73524b920a01f4dbe758f289e08)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b82579c0adc029b784b4f50887dc7595799e5d32
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Wed Aug 29 20:08:14 2012 +0200

    rc: fix some memory leaks.
    (cherry picked from commit 0813e08f0be94a42114440ebe07d41bec5555c93)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 55c7a24ddd0b080de5415da90b0364842db212aa
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Wed Aug 29 19:30:58 2012 +0200

    taglib: fix potential null dereference.
    (cherry picked from commit e7bfbd1dd509bb8bf569ce59c63b633f2ef9fc9a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d7567c3f13b2e2780eae1fb9cbd698fb1b92e547
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Wed Aug 29 19:11:11 2012 +0200

    Fix potential file handler leak.
    (cherry picked from commit a1dbddfa016acddef880829de54c67a10c3a730a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 84f41b3a704c24645e2e45fd627a754d89bca2e9
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Wed Aug 29 19:09:56 2012 +0200

    Fix potential memory leak.
    (cherry picked from commit 816e52c8f10798ed014b36362b846a0f46a3358e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 882b1c348dd7c6fb7027e6bca6ad64644bee1493
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Thu Jun 28 20:16:21 2012 +0200

    http_live: Fix off-by-one.
    (cherry picked from commit ea87467e04fb47498f13e15f1e4ce6095129132f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8856ef80390d7a7077011fe1848c050405be9f7d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 15:23:30 2012 +0200

    extras/package: disable the macosx dialog provider in VLC.app release builds, since it should only be used by VLCKit
    (cherry picked from commit 1c76df001e79fe965e20816d8c46c6ed20f45cb5)
    
    Conflicts:
    	extras/package/macosx/configure.sh

commit 361134fa2472a58b04a81ab0148d4cf2065a9716
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Aug 19 15:09:35 2012 +0200

    contrib/caca: fixed compilation with llvm-gcc by disabling some inline ASM
    (cherry picked from commit dfb4fa14a2624885422906176dd0f513cf8a6677)

commit 92c6cf6d2e392c4d4f63b6a8a2d8e7c302a23925
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 13:12:27 2012 +0200

    macosx: fail silently when crash log delivery gives an error
    (cherry picked from commit 42dd17214ba206318057843063236011c940050d)

commit 046a4dd12b7f0551a3a951a407b9583bbe1df7e2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Aug 28 17:46:36 2012 +0200

    contrib/bghudappkit: updated xcode4 patch to create an ibplugin, which can actually be used for production
    
    Basically, MACOSX_DEPLOYMENT_TARGET was set incorrectly in the previous patch.
    (cherry picked from commit 512b0a37768954aee13f08f55517025c1b230b9b)

commit e4cc885a18e91e0b32066a0e5e403484d9be5afc
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Aug 19 15:10:42 2012 +0200

    contrib/bghudappkit: patch to upgrade the xcodeproj used for compilation
    (cherry picked from commit 643d29c97c787139a1f8d45c5c756814635d92eb)

commit ee1cc51e653614a74dce3c980cd03561e06428ab
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Aug 17 21:39:27 2012 +0900

    dmo: use VLC BITMAPINFO types
    
    close #5950
    (cherry picked from commit 22466842dec9b8d707e5ae44b3151076787af7a5)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e9febc4cd80770e1ab133b336d1c3a73b97b2357
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Aug 17 21:39:26 2012 +0900

    atmo: include vlc_codecs.h to get BITMAP definitions (cherry picked from commit 0398b0c82e0b043de6404e1bad2ab0ecf2bcc31c)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 683f40b76c918bfa8b4091099972f2c999b1527c
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Aug 17 21:39:25 2012 +0900

    atmo: revert rename of BITMAPFILEHEADER
    
    vlc headers don't declare it
    This should perhaps be changed but that requires special look to atmo
    code since this plugins mixes cross-platform and windows code, and vlc
    and undocumented standalone compilation
    (cherry picked from commit c61bc9f4f972f5a78990370650960b1ee91c102d)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3933f2530e4c35196e7deb38c0605f614c8f862a
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Fri Aug 17 21:39:24 2012 +0900

    Replace the bitmap structures of Microsoft with ones of VLC
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    Modified-by: Rafaël Carré <funman@videolan.org>
        ... Replace them in ASF demux as well
    (cherry picked from commit a67afb66baa2aaffeaf71d3b319f44151a5c2516)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 89ab9f180ecd30977a15eb52ffe58c8b72b0fb72
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Aug 26 19:50:24 2012 +0200

    macosx: use a modern system sleep prevention mechanism for the 64bit builds (close #7391)
    
    This is a manual backport of 4a47fcb16. Regrettably, this API was introduced in 10.6 so there is no way to make it work for the legacy 32bit platforms.
    
    The benefit of this approach is that VLC can differenciate between system and screen sleep, so it can allow the system to turn off the screen while playing audio-only media.

commit 970c0c6562161609a8571e39cbe7d15e69f96455
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Thu May 17 02:30:07 2012 +0200

    dbus: Fix seek detection
    
    Closes: #6802
    (cherry picked from commit 1b2ae82caddba30d5ea32317997d4464957e582c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a97f94fa39c2255e651c3dd921d19f964568eeb4
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Sat May 12 20:54:33 2012 +0200

    single instance: append tracks as specified in MPRIS 2.2
    
    Use /org/mpris/MediaPlayer2/TrackList/Append instead of / as the
    AfterTrack argument to org.mpris.MediaPlayer2.AddTrack for appending
    (cherry picked from commit 0376739feee15fa4636e30e7c85f1be97f2d74f9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1b573cdc750fed013c52557ab2112dd38b0b4b92
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Sat May 12 15:27:18 2012 +0200

    single instance: Avoid initializing twice because of dbus activation
    
    The single instance mode currently tries to contact another VLC instance
    through dbus in order to find out if one is running. With dbus activation,
    it results to the dbus daemon launching a new VLC instance while the
    first one blocks until the new one answers the call
    
    This patch uses org.freedesktop.DBus.NameHasOwner instead in order to get
    an answer from the dbus daemon without it launching a second instance.
    (cherry picked from commit bcc158b70019bdd2d1ab647173cb1ea41751f706)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dc38610009f3fb305f14d99db7fac50b41db1483
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Tue May 1 21:16:34 2012 +0200

    dbus: Use the AfterTrack parameter in the tracklist's Add method
    (cherry picked from commit b64a3e09ece630d1843058df48b3aa3f8c00ebbc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 605bf8c3efd59f2d9da8a3882808509cd4b65f00
Author: Sean Robinson <seankrobinson@gmail.com>
Date:   Sun Apr 15 18:51:46 2012 -0700

    dbus: Fix the CanSeek property getter
    
    Close the D-Bus message when sending the value of the CanSeek property
    in the Player object.
    
    Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
    (cherry picked from commit bc2987f3e14694a90bae1c8b3aaede8519a950a3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 99ceea05ccf3a9289f5ba95d84bb06bc428077e0
Author: Sean Robinson <seankrobinson@gmail.com>
Date:   Sun Apr 15 18:39:26 2012 -0700

    dbus: Fix the Seek method's introspection data
    
    The position is an input parameter, not a return value.
    
    Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
    (cherry picked from commit d77c14f084c50ec3d5bd20fc09f0057e397d01ca)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d0eb8e52b9370de165935e65df4b62d99ea9fa7e
Author: Sean Robinson <seankrobinson@gmail.com>
Date:   Sun Apr 15 18:32:08 2012 -0700

    dbus: Return an int64 in the Position property getter
    
    According to the MPRIS specification, the Position property of the
    Player object must be an int64.
    
    dbus microsecond position overflows the unsigned 32-bit integer at
    about 35:48 into a track's playback.  A 64-bit integer still means
    an overflow, but after more than 292000 years into a track's playback.
    
    Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
    (cherry picked from commit 7531cecfd40941a7d21b4566cc3b0ee964290090)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f3006c702ca1125819761793e7f1a00fa8e27d85
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 18 19:12:29 2012 +0200

    dbus: remove excessive main loop debugging
    (cherry picked from commit 485d2aa510d1067af31c479964e7235da146ac4f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8635ad7c688857744722c05b34544374bad9b98b
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 22:45:55 2012 +0200

    dbus: really remove the configuration option
    
    (The previous commit only made it inoperant)
    (cherry picked from commit d9f36235b8671491e6ec14c0ce4bbce337bcdc06)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f05be1cbf169a6d6b135ec92e966a83ccd1905fd
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 22:42:25 2012 +0200

    dbus: do not spam at startup
    (cherry picked from commit 63b3ed339d118757ec7dd112a78845046c00569b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e0a45cc80868d2340c2cf43aa88f5f590a59f5a1
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 22:41:34 2012 +0200

    dbus: remove silly configuration option regarding unique name
    
    Register both names unique and not. Fail if the unique name cannot be
    obtained.
    (cherry picked from commit daf9bb252d940d3194d74620a127a8d0df7c81d2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5404917e61a1987d490f9e3342798c88c9e768ca
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Aug 26 14:30:31 2012 +0200

    macosx: when resetting VLC's config in the prefs panels, also reset the OS X specific NSDefaults
    (cherry picked from commit 85a9ef4fcb2019f29504900fdb104a60ec995f65)

commit 111d6a255db16d7aa234ce87d7911ccad2520461
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Aug 24 20:02:54 2012 +0200

    macosx/wizard: add missing error handling
    (cherry picked from commit 6100eb881537499c6de97bd5cb43c70f56455de1)

commit b9dc1b7deabd9bf96bd9d8be2a3b22210e71b2f2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Aug 24 20:00:03 2012 +0200

    macosx/playlist: add missing error handling
    (cherry picked from commit 5feeba277311d1d3215016dc7ce1e17e79c922f1)

commit efbf668dbefab0aa36218035f064aafe444cd4ee
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Aug 24 19:48:31 2012 +0200

    macosx/applescript: add missing error handling
    (cherry picked from commit 0dd9d856c522526594e0903336fc7b1db362b071)

commit 7b28d2e75eae222a2e8e773d297baa5864e5a60b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Aug 25 13:13:07 2012 +0200

    macosx: fixed drawing issue when expanding the main window after collapsing
    
    Inspired by efbad059

commit ad0e05bf7c86b1abab62b071437b094854c95bb2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 18:13:49 2012 +0200

    macosx: improve main window initialization
    
    This targets the same issue as 5b8a4057, but in a saner approach
    (cherry picked from commit f0a7d9a4906754d9c4c5f84354953e8bda79f535)
    
    Conflicts:
    	extras/package/macosx/Resources/English.lproj/MainMenu.xib

commit 653794fff3c22f0a64775e48f14146b5502cf8d7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 18:07:21 2012 +0200

    macosx/playlist: add another sanity check and simplify the code a bit
    (cherry picked from commit 1c2af88fd9d41ffb379ff4de6f59565f16d1df0e)

commit 3f2488d6aea3946a55b489bae2c2b5865b5905d8
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Aug 24 18:06:12 2012 +0300

    file: set the non-blocking flag on pipes and sockets passed as fd://
    
    (cherry picked from commit ed68c13dee214d79d4c9c9632e4bac4b5714da32)

commit 58faf523c19bb0a90234427b923488bfc3e531af
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Aug 23 22:16:02 2012 +0200

    FR: fix a typo

commit 29c14957ca1e811c0e47a267b2140f9d0db91332
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Aug 23 16:01:27 2012 +0200

    Win32: display stacktrace before modules list
    
    Stacktraces are more important than modules list, and we cut the data
    after 10k...
    
    (cherry picked from commit 9b77e1043394420137c674d47d9d9d265708eba2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit abbcafeb4e0755bae9924c415ca9ea9394cff0fd
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Aug 23 14:07:46 2012 +0200

    MKV: fix typo in metadata

commit cbe5e36fc00053c8f5cf35ecf08f65025ab55a49
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Aug 23 14:04:34 2012 +0200

    MKV: do not set a date in UTC format
    
    We do not know how to display it anyway
    (cherry picked from commit 6b00c288897b76217f81cb61257ab460dea7d279)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 965a0bb5862afd9a4b9244aa1c2b2f19a49ac7a0
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 17:46:24 2012 +0200

    macosx: fixed potential race condition
    
    items stored in a xib should only interacted with after its loaded, which may be after NSApp is
    (cherry picked from commit 1de6f93432e1be15cd58966f951f27fd543e9fb5)

commit 243c1fb61ae1b8fd8f60622e8d30caff000a6e94
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 16:38:43 2012 +0200

    macosx/playlist: add another sanity check
    (cherry picked from commit e32da3cbef3f10e311f00d0a68e2037939a292dc)

commit 5175451c90d066c99c17793559fcec1f289e5cb1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Aug 22 15:45:45 2012 +0200

    Core: display $Z as Artist - Title
    
    This is more coherent with the rest of the worlds...
    (cherry picked from commit 1c81c0863ba03ec8022aed8a8e3bac81884dd509)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 747ca86299160d2224b515d3f2b6d48944587ef9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 16:16:05 2012 +0200

    macosx: fixed random debug message crash
    (cherry picked from commit 8564f347c93455da29ebd65cbc5d2540b259e90a)

commit 0e79f6ff1d6fcfe13d557b4114c4769e4687b0ef
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 16:16:46 2012 +0200

    macosx/playlist: added missing sanity check
    (cherry picked from commit 17c0becaf161355c19c554fd472cefdfbe1b41eb)

commit 366d2126cc3afb0294932ed25629622bf57b7721
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 16:16:27 2012 +0200

    macosx/open: added missing sanity checks
    (cherry picked from commit e139c96cdabca52827db8843d9aaa41eb50460a1)

commit 3acd873e613c546132953296ce3614fef39d8de5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 16:12:23 2012 +0200

    macosx: fixed warning

commit 11fc0b736ef18397a3e423853972a577b7043d8b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 15:25:41 2012 +0200

    macosx: fixed crash in CoreDialogs when closing the progress panel
    (cherry picked from commit 52576ea50e1cb5d2fbb3ceba958128dc81ed13b9)

commit d83976cd2d5cdeba6bbf749ab19cfb2836e036f1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 15:48:01 2012 +0200

    macosx: fixed crash when setting up the video output
    
    AppKit could be accessed by a non-main-thread
    
    This is a manual backport of 9dd2f6ed46b8c4bb0399693dbb3f91d7efbfabb0

commit 669e67ba1ed8d2176bc9da8cd701d14cfc07a717
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 11:40:11 2012 +0200

    macosx: update crash log server DNS
    (cherry picked from commit 99acb947148500868c28998106e8af89555e2529)

commit 9ce7bc8e92eaefc1027f3cf1c0bc492f56d8f576
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 11:03:51 2012 +0200

    macosx: fixed crashlog lookup on Mountain Lion
    (cherry picked from commit aaec0d4e1d1331645a61419345534498e976fe2d)

commit fc6d6a0e5d394dd3538ff72e216ed53404ba894a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Aug 22 11:02:57 2012 +0200

    macosx: update check for Lion and add another one for Mountain Lion
    (cherry picked from commit 0849d6e510d6e46a9a90f24d96fc800dfbdeb998)

commit 3ae9d98932a785974621dca1245f191bd0a79705
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Aug 21 23:29:00 2012 +0300

    ftp: memory leak
    
    (not cherry-picked from commit 2b9e7ac1...)

commit 246951ccba84c9154349c50c01c9f6c8ff2d7a9d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Aug 21 16:59:42 2012 +0300

    var_LocationParse(): accept semicolon as separator
    
    This is for backward compatibility with existing VLC playlists and
    VLC playlist generators.
    (cherry picked from commit cb9a583ca2434457162da922548371cd30be7675)

commit 8d6ca0d73b9091c9e0ff7647ab9d9a3de6f68187
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Aug 20 17:33:27 2012 +0300

    XCB: key symbols list update
    
    (cherry picked from commit 55cb3971ca07c3ca103231e7d5f7ed939233bd09)

commit 5cb3fe07f4eaa37b10b9ace457e620f7c04ea140
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Aug 20 16:39:14 2012 +0200

    Qt: allow selection of 2.x style
    
    Close #7108
    (cherry picked from commit a8aa5d64069abf6c8ea43532ec2bd09274984564)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2a37d93c6429fc5d8483ea4beb5caadc10ab7902
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Aug 20 15:55:32 2012 +0300

    Qt4: simplify and hopefully fix progress bar deletion
    
    This should fix LP#947156.
    (cherry picked from commit f36c50b0a05478a64f9c8a9b2df657ab625812d9)
    
    Conflicts:
    	modules/gui/qt4/dialogs/external.cpp

commit 0fca9c10f63dabc82b7d357a3b5835b5e0efdd4e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Aug 20 15:43:28 2012 +0300

    Revert "Qt: external progressBar, simplification for win32 style"
    
    This mostly reverts commit 7240444db88efabeea7e85310864f6b48c19537e.
    This broke threading rules for Qt4 GUI.
    
    Conflicts:
    	modules/gui/qt4/dialogs/external.cpp
    (cherry picked from commit 29de0421e5c6b377cf6267da1b638c80507419b1)

commit af84e815faf594697b0e9b94d6bf356833c71efa
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Aug 20 15:00:30 2012 +0200

    macosx/configure.sh: disable the caca vout by default

commit 3df41cb62cc53da20d8f859c37cbba7dc49fe6ae
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Aug 17 14:39:56 2012 +0200

    contrib: fixed SDK lookup using Xcode 4.2 or later
    (cherry picked from commit 6b521aafb0b4db719cd4b6a173b51f27971c9fec)
    
    Conflicts:
    
    	contrib/bootstrap
    	contrib/src/main.mak

commit d9f701924d900821cd77c0575a2b77dd5c2d788c
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Aug 20 15:21:07 2012 +0300

    Qt4: fix compressor and spatializer initializer order (fixes #7296)
    
    (cherry picked from commit accf189a2554fb52e4a362be55124f13f510fdfb)

commit 31ee7dec1fa320b7b65f5235551c835496a2d422
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Aug 20 00:42:42 2012 +0300

    contrib: gcrypt: add SHA-256 for GnuTLS
    (cherry picked from commit adc154c0cf91cac72b31907acbf400d71e8dd24e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ae296115f09facb2004fc7537d9484c3136fa1cc
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Apr 17 20:25:03 2012 +0300

    Qt4: override playlist configuration on request, _not_ on exit
    
    Fixes #6346.
    (cherry picked from commit 212b20ddf01c4eef7817e34a8107620bdff170ed)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bb4b1b5f5778a31b40849b1ab5da5ba90099a14a
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sat Aug 18 00:35:48 2012 +0200

    l10n: German update

commit c4823b936db7c0c4f80776010b66af97605fd398
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Aug 17 11:05:16 2012 +0200

    NEWS for 2.0.4

commit d200f5731e5ac26392e41d8acfdf9668959adb43
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Aug 17 02:08:58 2012 +0200

    D3D: Fix wallpaper mode under Win7
    
    Close #7348
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 42480e9fe9f1b4a39d566c5d85aeae92706a3934)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 200bcb49377636df1e618cfbbe0ff1b1d5c46e70
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Thu Aug 16 15:08:25 2012 +0200

    Qt: InputManager: UpdateMeta() on Item change. (fix #7321)
    (cherry picked from commit b54356d11dbafa1d3cce837b43faeedb9413941b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8f0ee34d6a8ef91d6f35e12e9640c53bfb823657
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Sun Aug 5 23:50:53 2012 +0200

    Qt: Support disc drives probing for OS/2
    
    (cherry picked from commit bcc966adc2519d3edcec86a7221bdefcfb4aa22c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    
    With some adpation to 2.0 branch
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>

commit 717f28a0767a23c8b960a149f3873b9c1fcabaea
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Aug 16 13:49:32 2012 +0200

    macosx: fixed setting the following options on the command line: 'macosx-vdev', 'macosx-nativefullscreenmode', 'macosx-video-autoresize', 'macosx-black', 'macosx-mediakeys', 'macosx-appleremote'
    
    This also closes #5892.
    
    This is a manual backport of 7f0b026896bf32365a641b54bc9d88d95d45885d

commit 408240ed21b1ea0249b9552ba516cdbe835478ca
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Aug 16 13:44:56 2012 +0200

    macosx: fixed 'video-deco' and 'embedded-video' recognition when set on the command-line
    
    Manually back-ported from e5d1d74558f5b116e10792e44e8aa85df0017fd2

commit 39a6915679a8da769b5d1326ba39e80ace77dde7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Aug 16 12:40:42 2012 +0200

    Qt: set ttl on sout correctly. Close #2631

commit 5deee43b1f85a8def839aafa65967e65a4fab074
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Aug 15 10:11:53 2012 +0300

    Qt4: fix types conversion in extended preferences

commit 6f1bad2aeacfde77e8ddcde1fc333825014334f8
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Aug 13 22:09:50 2012 +0300

    PulseAudio: do not assume sysconf() returns a finite value
    
    (Here -1 means infinity.)
    (cherry picked from commit 191f071695d272e99de17787d33e773606656430)

commit a8377747ad6e87f1a491345c19177f6490c3b144
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Aug 11 23:23:36 2012 +0300

    Qt4: /dev/dvb/adapter is Linux DVB, not just Linux
    
    This is also used on *BSD systems.
    (cherry picked from commit 052974831b2b50682a37933c992d2606fe1845b3)

commit 56553ea8d49e24d13b30ec9cd1fb9e9e08a05ea5
Author: Zoran Turalija <zoran.turalija@gmail.com>
Date:   Sat Aug 11 23:18:48 2012 +0300

    dtv multisat: Allow command line option dvb-satno.
    
    With this option marked as unsafe, it is not possible to use it and
    as a result, it is not possible to tune to different satellite on
    different DiSEqC LNB.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 06683a063d0aa4096ff92edaa036d70853ec4b98)

commit 96991da8c0c00da76c552d2cf9daadf3fb531f90
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Aug 11 23:16:38 2012 +0300

    DTV: do not assume __linux__ == HAVE_LINUX_DVB
    
    This should fix DVB on *BSD.
    (cherry picked from commit bfcefbf2b35650c8149ed9e94890f669187c8a50)

commit 826d649eb88ff06bec7840f2e261769b297ef307
Author: Geraud CONTINSOUZAS <geraud@gcu.info>
Date:   Tue Jan 3 09:55:39 2012 +1100

    fix missing reference for _POSIX_HOST_NAME_MAX on FreeBSD.
    
    FreeBSD declares it in limits.h. Add the proper include.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 62046de312966ae0c726f52dcdd66fb439b2d6d8)
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 8ca3eb9b8c63e6f7f817bc53717a96c7cbb24538
Author: Zoran Turalija <zoran.turalija@gmail.com>
Date:   Fri Aug 10 17:13:09 2012 +0200

    dtv multisat: Set dvb_diseqc_master_cmd command length.
    
    FE_DISEQC_SEND_MASTER_CMD will fail if command length is not set,
    preventing multi-satellite tunning using DiSEqC switch.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit cfb1f18ec5543abfa35050600377548b69e6907a)

commit 7b2fee05a21ca9df7cd1b23054aa23d066a2837e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 9 21:21:43 2012 +0300

    News

commit 67c40ab2f510055c91a854d691419f2943bfd20c
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 9 21:16:27 2012 +0300

    PulseAudio: print debug if we cannot estimate the start time
    
    (cherry picked from commit 9309fb85a95717a64e6ac3634ffdfbb2d56c551e)

commit b1568196ab7431076beac3385201dd2ef85fd952
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 9 21:10:23 2012 +0300

    PulseAudio: mark stream non-monotonic
    
    In some cases, that gets more accurate timing meaurements faster.
    
    VLC does not use pa_stream_get_time(), so there is certainly no need
    for pa_stream_get_time() to return monotonic values.
    (cherry picked from commit 44bf8bbcb3fbd1d6c04c2ed8eec27f75f8faf340)

commit 472b7408ef57daf5715545c8c90437b6b4e5ee5f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 9 20:57:10 2012 +0300

    PulseAudio: do not ignore latency updates before stream trigger
    
    Such a latency update is an opportunity to reschedule the stream
    trigger time, or to trigger immediately if late. That can reduce the
    initial audio delay in some cases.
    (cherry picked from commit 1b06737a297cc5b9c48dd12e2e456b45bc6891d2)

commit b9aa608bbb53c892ba83ee999ac4be61b68d84cd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Aug 9 17:10:47 2012 +0200

    macosx: disable virtually all CoreAnimation effects in the main window on Leopard (close #7047)
    (cherry picked from commit 6e56b492f796a458e06dc21d29d534849af12fd8)
    
    Conflicts:
    	extras/package/macosx/Resources/English.lproj/MainMenu.xib

commit 2039e05517bec3fadf60e4ece00025854f416a6b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Aug 9 12:26:09 2012 +0200

    macosx: fix and clean-up the bookmarks code (close #6947)
    
    The code is far from being great, but it matches the Qt intf now.
    (cherry picked from commit cd612818db02b7831bec1d72e0a864f968daed6a)
    
    Conflicts:
    	modules/gui/macosx/bookmarks.m

commit d8ee86a46aaa158be40aa5824c55a3e6f9fc456a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Aug 9 17:27:36 2012 +0300

    Spelling fix
    
    (cherry picked from commit 44488d6d4cd586d9cafc9f5a0a2325a6a5285be2)

commit 42793363cb27c60e0f43cb7e045d5db979e5730a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Aug 8 10:41:19 2012 +0300

    mod: do not attempt to parse standard MIDI files
    
    VLC has a native parser with higher priority. So ModPlug only got to
    parse the broken files that VLC rejected. ModPlug is not robust and it
    crashes in that case.
    (cherry picked from commit 76b15d4038e1f2200ab463c275c0854848de8671)

commit 386dd0e069e36212506db0d65664c81b5ae80326
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Aug 8 00:22:00 2012 +0200

    Contribs: update libxml2 to 2.8.0
    (cherry picked from commit 7f3a4223264adf5412783c239e8244daa2404e91)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6202035573a2c38867a8975038d40c79b793ca29
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue May 29 12:53:49 2012 -0400

    libxml2: pthread_join might be available without libpthread
    (cherry picked from commit f8aa3950318b1b13a3b51b8c862a8a2c92d17229)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 22081ae95c5046255b3d0e436bfb5a1bbf1192ed
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Aug 8 00:32:02 2012 +0200

    Contribs: update freetype2 to 2.4.10
    (cherry picked from commit 74b50fc63e1ecebb26f2085cc70be64303e125b3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 510cd3767c0703073f8791477e49a27adc2e2f78
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Aug 8 00:30:20 2012 +0200

    Contribs: update tiff to 4.0.2
    (cherry picked from commit a3e44089c3876487ca3a1b6183e507718703bd89)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9aa2025990c5f71bbf5e2ac8680b35f1b376320f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Aug 8 00:27:11 2012 +0200

    Contribs: update libpng to 1.5.12
    (cherry picked from commit 38830c3bfd53aed07bb40f321a1490e16359c7ef)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eb5530916d64223f2f3579739e6bc1bfe70b09e1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Aug 7 20:08:15 2012 +0200

    macosx/fspanel: allow continued clicks on the backward/forward buttons like we do in windowed mode (close #7258)
    (cherry picked from commit 14cc1eed64be69186f1076136fcc5154123b5b36)

commit e89094b16a9caf53f91511fee9713d07409f749f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Aug 7 20:15:09 2012 +0200

    macosx/mainwindow: added sanity check for the window size after restore (close #7275)
    (cherry picked from commit 4ee68dda548ef30ebe63e747fef92544b42c256a)

commit 60af791011d0823cc86eb6e539dce37e44559c83
Author: Mark Hassman <mark@hassman.org>
Date:   Sat Aug 4 19:32:30 2012 -0400

    WebUI: Update Playlist improvement
    
    Close #5583
    
    Playlist is cached/updated locally within browser instead of
    refreshing after each function call.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    
    (cherry picked from commit 60758c0313ef5553515bbc545dc5aa4b9299ca3c)
    (cherry picked from commit b4cf7a9b5b5c568dd2cec85ff880f92703999814)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fd3585bc3d5086e57faa11df752d398fa9284eb9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Aug 5 23:03:18 2012 +0200

    Dailymotion: fix the parsing of the pages
    (cherry picked from commit d23510deb0bba4433496d27c2808c750332bb59f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0d4a5de93522a3457c034f1dd0ea2e86723a291f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Aug 6 00:16:02 2012 +0200

    SSA: do not use memmove
    
    Ref #7210
    (cherry picked from commit 2a8983fe255ba7e531ca9aeeca46617b295955d2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cbf66df4ae08c13cf509d600e12630f989ae58f5
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Aug 6 17:35:46 2012 +0200

    Update libavcodec sha1s
    
    Close #7251

commit 4f6e0e0f2935bdaf55c50305291bab5b8b6921ef
Author: Sebastien Zwickert <dilaroga@free.fr>
Date:   Sun Aug 5 13:38:51 2012 +0200

    vout_macosx: disable the VOUT_DISPLAY_HIDE_MOUSE event to not hide mouse cursor when we need it visible.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 80fb36e480d7cba4d52bf858c76f905ff2d33b90)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 086dffbb2883b469ac4f3a5bb2854bcf305933b0
Author: Thierry Reding <thierry.reding@avionic-design.de>
Date:   Tue Jul 24 16:31:13 2012 +0200

    freetype: Fix a possible buffer corruption
    
    Memory associated with a FcPattern is freed when the pattern is
    destroyed, so copying the font filename needs to be done before
    the call to FcPatternDestroy.
    
    Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
    Modified-by: Rafaël Carré <funman@videolan.org> (simplify return)
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit ae3fd8273b0a16b6ab7f17e119b5d1beb79f4a14)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6325b1c31c2703fd836dcc1c01120671f56e99a5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Aug 3 14:37:34 2012 +0200

    macosx: fixed NSRangeException when triggering modifier keys without characters as enabled by some international keyboards (close #7268)
    (cherry picked from commit c97faddc527a0455c93419982b23763a3d6485d8)
    
    Conflicts:
    	modules/gui/macosx/MainWindow.m
    	modules/gui/macosx/intf.m

commit c772af6d95282ce257fc78dd6f9e098453571b48
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu May 31 20:27:59 2012 +0200

    bluray: Add missing vlc_mutex_init
    
    This should fix #6875
    (cherry picked from commit a5c381a215d7b4deda2b338dbc7ab9c585399ee7)
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit fcde0be30ef6790239cae0832b3367e2876e79c2
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sat May 26 19:04:57 2012 -0400

    visual: check for NULL before free
    
    Close #6879
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 73e246278f8ef609ab9ac07272343c3faba8d644)
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 0f664fbe510fe63b6395275c05d10aa2c345b821
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Jul 30 21:20:52 2012 +0300

    v4l2: fix cut and paste error
    
    (cherry picked from commit f8ac92544e8668a436f6c997275b989b0c5d7299)

commit c1f5872b05d3108d10894fb85cc50353742e21a6
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Jul 29 17:34:54 2012 +0300

    NEWS

commit e89f4296febf218a5669a8ceb09ee79d9def0f25
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 13 23:41:42 2012 +0300

    Revert "Notify: add a callback to match telepathy, msn"
    
    The "item-change" callback is called with the playlist lock held in
    at least one case: when the now playing meta is cleared while a new
    input is created by the playlist.
    
    playlist_CurrentInput() acquires the playlist lock. So the
    "item-change" callback cannot call it. This bug is present in the
    Growl, MSN and Telepathy modules since version 1.0.0. It got copied
    into Notify in version 2.0.0.
    
    This reverts commit fc56b92af1636c53a0545109a74476fe74c054a5.
    This should fix #6641.
    (cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)

commit b895679e65357d1b08f6d2f36de690f8a8964ddb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Apr 19 17:09:07 2012 +0200

    macosx: fixed a bunch of compilation warnings, which popped up using newer Xcode release
    
    no functional changes
    (cherry picked from commit f7986362337e1af1b181b8cd0244894de6070db4)

commit 1ea27b12e6cf18d85532cc7db35d106aebb7e71e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Jul 28 12:01:57 2012 -0300

    macosx: set video frame to detached window frame, instead of vice versa
    
    Now, the detached window position is restored on relaunch. Furthermore, this fixes some positioning issue when switching from macosx-background to detached video view.
    
    Manual backport of 41631564e91d928f762d0aa56417e93c32db0a52
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 3e25459f4a43d889d8021491052b7fa1a50af2b3
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jul 28 11:33:32 2012 -0300

    macosx: make sure that the marquee is displayed correctly when enabled for the first time in a session
    (cherry picked from commit 412b2d72b707eb84c6b0854cc07dfdc56ba0826b)

commit 31a66c9c55654e06b946d3826a2008a755fcc901
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jul 28 11:31:57 2012 -0300

    macosx: prevent crashes when enabling or changing the marquee string (close #5991)
    (cherry picked from commit edee0a568395174b107369624b145f90d069cc1d)

commit 1777f5543d331665bf201957e1df2efb828e5e91
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Jul 24 12:29:03 2012 +0200

    macosx: display preferences windows on a level >= video window
    (cherry picked from commit 7f48cb43002663d67614c08315705c3e1ff5b66e)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 55f6ac26b75e847baf785f4e18d7c08fc6d7a140
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 25 19:04:00 2012 +0200

    macosx: disable extensions submenu when they are no items to display
    (cherry picked from commit 23247a858d2826594ba37343b59a19fc16fecd33)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 0c290c6560603b94c0319f6c5981fe326086b2f0
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 25 18:38:09 2012 +0200

    macosx: improve main menu handling for autogenerated items
    
    especially:
    - don't show outdated items in sub menus
    - disable unusable sub menus
    
    close #6998
    (cherry picked from commit 07e72e56f24d7184334bb7e25911c0a1dfdf2c3c)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit c4ea557137df26c5b73500de42fb3f8ec3484f85
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Jul 23 13:18:10 2012 +0200

    macosx: remove outdated and unused isFullscreen methods
    (cherry picked from commit 18dee68f3ace8adfda6e5982daa41755103f9723)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit dac588bc95b93613be30615df73591dfe43a3a04
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Jul 23 10:10:34 2012 +0200

    macosx vout: move setter for window level to vout provider
    (cherry picked from commit 9bd356e5608e5a13890f7f811bb7bd86f2328769)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 4bb0ca5857744c75a8f95016f0902051ff69d618
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Jul 23 10:08:18 2012 +0200

    macosx vout: don't reset window state on close here
    (cherry picked from commit 304a1c0a392212ef3cdc44481c190518956e6d27)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit ae66a7775cd4eb96217b4167b6275d624e5f1891
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Jul 20 16:15:35 2012 +0200

    macosx: improve playlist context menu handling by selecting the right menu item at mouse location
    (cherry picked from commit 729fe67eaab131e283c386d478c816c768b2df28)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit bb7a83f86c37edfa0d6d850b4ed96da43550cd4f
Author: Benjamin Drung <bdrung@debian.org>
Date:   Sat Jul 28 00:48:59 2012 +0200

    Fix typo unkown -> unknown.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 3f0d5d17820de59e73530d51530ce9d90ae7ef67)

commit 3dfede2e5d9d115cfb4721b86d16240c56782ceb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jul 27 15:41:53 2012 -0300

    macosx: fixed race conditional crashes in PXSourceList (close #7171)
    
    Trust the ObjC runtime, it will do its job properly.
    (cherry picked from commit 50329a43138159395ad0e67f44a7a0c2815546f3)

commit 9855165f8168f0db54852d208fd8be8a3e5cffb1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jul 26 23:08:34 2012 +0200

    HTTP intf: support opening of playlists in the browse dialog
    (cherry picked from commit df3b867cf33330a3e75055722aff7dd54ca99f88)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ac7e319910923a63323728ce7ce999a52432c548
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jul 25 18:06:43 2012 +0300

    fr: splitter != filter
    
    (cherry picked from commit 1904dbf5172cc63e3b209d4f0ca8cdd9fad562b4)

commit fcf83fda1a4b750eaea646ebaa4ca75cfb8a0723
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jul 25 17:23:06 2012 +0300

    PulseAudio: show device product name rather than card number
    
    (cherry picked from commit 1ddac7d47eb3c34eeffb03be6261c766686a8f96)

commit c85689ef654f8f75940030924dc1528acd457cac
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jul 25 17:16:10 2012 +0300

    udev: do not list ALSA SD if PulseAudio SD exists (refs #7221)
    
    (cherry picked from commit fbe71a6680fd1b91ce3a69b43f250b1704ff93d0)

commit 958f15fdc01d1d10dd123caefc46ca4366591346
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jul 24 17:40:17 2012 +0300

    httpd: add video/webm content type (fix #7208)
    (cherry picked from commit b0fb30cb10af32c3ec9f1558dd92eadeca8437b6)

commit cedced8c5840f1cbf00f8906d68b9bd9c387bd2e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jul 24 17:42:56 2012 +0300

    speex: speex resampler is broken, drop priority to zero
    
    The library introduces noise in unclear circumstances. There does not
    seem to be any problem on VLC side though. I do not have time and
    expertise to troubleshoot this.
    
    (adapted from commit 27a3a08018581aab3e53b92f0ce09e680c969373)

commit 49febb1bcd33cfbb090109f11adad3403ce4dfef
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Jul 23 19:06:06 2012 +0300

    News

commit b98a2ef126e06de8fa19d05835847861b8ba2a26
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Apr 2 23:10:30 2012 +0300

    ALSA: correct S/PDIF start timing (fixes #6565)
    
    This is completely untested, but it seems logical.
    (cherry picked from commit 89d23df7d82a27c42cfa3a52d4008e34130bc99f)

commit 1dd7d2abccba2c9d85b6358459ad72f3f47a770d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jul 19 19:50:04 2012 +0200

    on the road to 2.0.4

commit 77aa89e8d7bd949d3c2946b130badb7c570023a6
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jul 18 21:52:33 2012 +0200

    Update-po

commit e6139014b8aac0aa4c0ad32c67037ed74b0c6983
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jul 18 17:15:42 2012 +0200

    NEWS: fix typos

commit 87b81d3c3b85807f72b94626e28075ca7615077e
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Wed Jul 18 16:00:39 2012 +0200

    NEWS: mention Thai update

commit 778305c7eea4933666cbc1d1d01753d167137627
Author: T. Chomphuming <jernghan@gmail.com>
Date:   Wed Jul 18 15:57:27 2012 +0200

    l10n: Thai update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit ac526dbdc0eef846feabad69fea1fc85731b218a
Author: Fabian Keil <fk@fabiankeil.de>
Date:   Sun Jun 17 13:56:47 2012 +0200

    audioscrobbler: prevent an endless loop inside the main loop
    
    Fixes the clang complaint: The right operand of '<' is a garbage value
    
    This might fix #6286.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 8cdc20d360fbefa12671abf8ff30c41384d110c7)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 64a2b485c1d7ee676074b6afd2baf4145c186968
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jul 18 01:00:04 2012 +0200

    macosx: vlc object handling improvements (refs #6883)
    
    should solve a few problems on termination

commit f0cbfc7f254fdf292f2016a6c76b4569936381e3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jul 17 10:23:05 2012 +0200

    NEWS for 2.0.3

commit 74632021986be07f4afe48347167b84f60b04d5b
Author: Rui Zhang <bbcallen@gmail.com>
Date:   Thu Jul 12 19:59:25 2012 +0800

    avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 352ea7df94b18869277457c79e7d5c10f388f075)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    
    In fact, it closes #7145

commit 14af02854b6840c2ee2ca29442b7712341102084
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Mon Jul 16 16:18:02 2012 +0200

    Typos, more languages are updated

commit adae1162cc9926c03dfbf6d68fc34b9aeddb721a
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Mon Jul 16 16:16:50 2012 +0200

    Typos, name spelling

commit ce6c9e1621ec37a0588b3887d955d36c58fd90a6
Author: Alexander Lakhin <exclusion@gmail.com>
Date:   Mon Jul 16 16:14:16 2012 +0200

    l10n: Russian update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 3994c441d550c32f1c700616b52d44b9bdae6286
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Mon Jul 16 15:15:34 2012 +0200

    Adding th and mr to language list

commit fe6574e0690b6256f57f5c8d35d632e047745e3c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jul 16 14:42:05 2012 +0200

    l10n NEWS

commit d444204002b3ed289a149e5283a316e9995a34e8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jul 15 19:39:08 2012 +0200

    macosx: fixed crash when opening DVDs with uncommon disk names (close #7146)
    (cherry picked from commit 68889de9bd2481b86c44e4d4150bbad19ffd5416)

commit 5a39587ca629f894a9152e2131b3658bd7c83271
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Jul 13 13:54:26 2012 +0200

    Updated AUTHORS from git log

commit 25667b7e87141887f057d4422668067408817015
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jul 12 17:15:40 2012 +0300

    http: write GET line in one go
    
    This can save on TCP packet if Nagle somehow fails, and work around
    bugs in some broken HTTP servers.
    (cherry picked from commit 1924e5e81dcdb226e67933c54a48cba7f910d4bb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3b457acd9594511c678ab8647e42a3b392a24d78
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jul 12 17:13:34 2012 +0300

    http: cosmetic
    (cherry picked from commit 43d5697733f19ae966de45fb1eb6b0b5589c6442)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fd8b5238764ed90ed57a7f323d0f3754add1426b
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Jul 13 00:07:22 2012 +0200

    AUTHORS add new translators
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit ed67af7e7d7121b702d11f01003774066a6db1aa
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Thu Jul 12 23:37:34 2012 +0200

    Language list: adding be and br, resort for lang code
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit eb29e0049ea50e03ae2a461c71367c34473f8b69
Author: Chandan Kumar <chandankumar.093047@gmail.com>
Date:   Thu Jul 12 22:22:59 2012 +0200

    l10n: Hindi
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 8ae12d4481fc7d17a6696330430ec316e949915f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jul 12 18:49:14 2012 +0300

    nb: use consistent (if less precise) language code
    
    (cherry picked from commit 7db7be8bd2e68d13470c92b6d92f2105aedd924b)

commit fd0b710bf620ba546e7ada40380b2ab8d806845f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jul 12 18:47:06 2012 +0300

    po: missing or incorrect language codes
    
    (cherry picked from commit 9181681e2dd7b9eeaaa3acf99c2f18b7862c9117)

commit 11ae5f2b1791cf30418f9af4fbabdb6e7c140e8a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jul 12 18:37:17 2012 +0300

    fr: typo (again)
    
    (cherry picked from commit 314084ad1cbead060cb4d36f57c9441771ef9f31)

commit d14a42b3853ccf99e81780239117611b08c604d6
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jul 12 18:35:03 2012 +0300

    fr: two types in one line
    
    This is the second time this commit is applied. Consider this is the
    last warning for French translation. Any new revert of my corrections
    without explanation will be re-reverted without further notice.
    (cherry picked from commit 01c41858a7fbd7d19fb9a69fe137e3e7ac088437)

commit 4e2d6395c58060f47b610b132ea3219931f0abc4
Author: Thomas De Rocker <thomasderocker@hotmail.com>
Date:   Thu Jul 12 16:56:09 2012 +0200

    l10n: Dutch update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 261a25a62b04301fa725f509356ce525fde911c0
Author: Denis ARNAUD <denisarnuad@yahoo.fr>
Date:   Thu Jul 12 16:38:46 2012 +0200

    l10n: Breton update
    
    Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

commit 5e8e1b72e0f2cb570f062fa431777f2c34a896d1
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Thu Jul 12 16:17:16 2012 +0200

    l10n: Slovenian update

commit 77df6ec967eda82b7a128a06593dab969419ee78
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Thu Jul 12 15:51:58 2012 +0200

    l10n: Add Uzbek to LINGUAS, update AUTHORS

commit bfd659aa805fc8268a57588363382f733897c9d7
Author: Umidjon Almasov <u.almasov@gmail.com>
Date:   Thu Jul 12 15:27:40 2012 +0200

    l10n: Initial Uzbek translation

commit 3e9a1e010d8219d45098690aa73cfa2c5d6bb55a
Author: Gaëtan Rousseaux <gaytan@skynet.be>
Date:   Thu Jul 12 15:22:22 2012 +0200

    l10n: Walloon update

commit 41ec6696b050a897f0cdd4e8e9a7d958b94f8ced
Author: Dean Lee <xslidian@gmail.com>
Date:   Thu Jul 12 15:10:53 2012 +0200

    l10n: Simplified Chinese update

commit ba53ad1d7b975977f4458d08dc2f8ddd65dd5c95
Author: Kaya Zeren <kayazeren@gmail.com>
Date:   Thu Jul 12 15:07:19 2012 +0200

    l10n: Turkish update

commit 957a3edb9ab0a85525ba60de97568f2339c702c9
Author: Michał Trzebiatowski <hippie_1968@hotmail.com>
Date:   Thu Jul 12 15:02:33 2012 +0200

    l10n: Polish update

commit 564623977bad8a8af7499a9e13df6c92f3cb4c69
Author: Rajnikant Kumbhar <rajnikant.kumbhar@gmail.com>
Date:   Thu Jul 12 14:54:50 2012 +0200

    l10n: Initial Marathi translation

commit 515f39ac12fa170465792602bb45a6373809f549
Author: airplanez <airplanez@gmail.com>
Date:   Thu Jul 12 14:30:48 2012 +0200

    l10n: Korean update

commit 8eb184b32e999f64dac9d30b9aba448917df07e8
Author: Khoem Sokhem <khoemsokhem@khmeros.info>
Date:   Thu Jul 12 14:26:10 2012 +0200

    l10n: Khmer update

commit 1d480e7e56d8ab61d455597b5b92d480c0be4feb
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Thu Jul 12 14:13:47 2012 +0200

    l10n: Japanese update

commit 8bb6e860c844750384db365d85ed9253d305d6e7
Author: Sveinn í Felli <sveinki@nett.is>
Date:   Thu Jul 12 14:07:22 2012 +0200

    l10n: Icelandic update

commit e0652fe2d2bf3f5c94fdcc18e2398f2cd60ff4c2
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Thu Jul 12 13:59:52 2012 +0200

    l10n: Hebrew update

commit 83a8baca4098e856761f46af301633ca3a9ba6ee
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Thu Jul 12 13:45:58 2012 +0200

    l10n: German update

commit 9049ab19bb6bdc6a0d618d509807368b5d16d55c
Author: Tomáš Chvátal <tomas.chvatal@gmail.com>
Date:   Thu Jul 12 12:57:21 2012 +0200

    l10n: Czech update

commit 6f4fe72b14005fc9e5b09f7d36cc90212e3614b6
Author: Michael Bauer <fios@akerbeltz.org>
Date:   Thu Jul 12 01:13:32 2012 +0200

    l10n: Gaelic (Scottish) update

commit b772f3812bbcfd92b8dc61b2c12b8751b12d6e32
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 11 23:00:50 2012 +0200

    update NEWS

commit bb6f0178e055f197e42f08603dd742d1a997f9d5
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 11 20:08:01 2012 +0200

    macosx: activate app when going to fullscreen
    
    this fixes a really nasty window layout mixing foreign windows with
    the fs controller and the video, when activating while window is inactive
    (cherry picked from commit 2975e9168d3bc1844dd92aaadb0391390c7920ab)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit dcf3c9132e4eed6fc861f82fc37d68344ad336b2
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 11 14:14:56 2012 +0200

    macosx: fix playlist reordering problem
    
    close #4397
    (cherry picked from commit 3525d588796c899b77d076f80444e39656bc8907)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 9731dc0a1394d74a560211cab0a30f354aac181e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 11 13:01:27 2012 +0200

    macosx: fix fullscreen set by vout only (e.g. over http interface)
    
    close #7117
    (cherry picked from commit 6b7c0c9fab5394dceaf483381ecd297a40947152)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 2c21880ee59a1e8962c30404c8f3a112e9de3aea
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 11 12:59:50 2012 +0200

    macosx: remove outdated methods for fullscreen handling
    (cherry picked from commit d9cfe67b8e23f388e45aee1919af1d4d773ec0d3)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 5cc79682dda95c955b948300f77526998d99c25d
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sun Jul 8 11:12:01 2012 +0200

    Use correct spelling for be translator
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit b03910900b9d9d0a7b316c563cfbad6e1a53ffbc
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sun Jul 8 22:21:49 2012 +0200

    typo: No newline before period
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit a6b1608d077c5729f0e91ea16af6418fa3271579)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 09b014106f84f93d1a9cc004e26628d2dc244597
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sun Jul 8 11:12:00 2012 +0200

    Spelling of Ukrainian in NEWS and AUTHORS fixed
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit e938f3a470813a21d02f8fb4f7be36785004f064)
    
    Conflicts:
    	AUTHORS

commit 106907a33ddd2a524fbe06712c2f4fdebde5b2ac
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Sun Jul 8 11:11:59 2012 +0200

    Adding gd to lang list
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 77f4a68616e6ae7dfda09775dcd638bd059e568e)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 7ab519f69b394d2aa3e9e6eec7f385809b644b9f
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Jul 6 14:24:27 2012 +0200

    macosx: don't allow a automatic resize beyond the right screen border
    (cherry picked from commit 4b40a27d7c642132eb9f2de5209cca76ab85be79)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 03cb327793ff5904646ea019ff23fd65960c93bf
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Jul 6 14:25:28 2012 +0200

    macosx vout: always use current bounds for picture placements, as we have custom resize constraints in ui code
    
    (in particular, the parameter cfg will not always hold the right window size value)
    (cherry picked from commit 7d42f68ab84fc29d1c3bc969487293c4ee6e9dcc)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 080a5c3dbed4fe9a6e70c8c56ee07d9dc7388823
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Jul 6 14:54:11 2012 +0200

    macosx: select right screen when fullscreen on startup is enabled
    
    close #7051
    (cherry picked from commit b71b4312976d6ee7b067c8dbfeb59dab83da5505)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit c804a4c1d1c2058e3d766d141e3c6182df832d90
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jul 4 20:13:28 2012 +0200

    macosx: handle volume apple remote keys as hotkeys, so that osd stuff is shown
    (cherry picked from commit e0b3dcd221af12921ef9f8ceeb5e1eab30e6019b)
    
    Conflicts:
    
    	modules/gui/macosx/intf.m

commit 9fe74f87d269480e36c9e3413e3a03a0b8dd0868
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jul 5 13:58:26 2012 +0200

    Use a less broken hash in case you use libav

commit 8fc82358ac0732513ab92a61bd0ca756f55d5ee6
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jul 4 20:07:31 2012 +0200

    macosx: fixed incorrect shortcuts for playlist and playlist window
    
    Pointed by David. Only the stable branch was affected.

commit b5e0e241a0f5e1dafa4625f7ad193d27f69188bc
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jul 4 19:22:25 2012 +0200

    contrib: taglib: use original patch present in taglib.git
    (cherry picked from commit 40f0a08c4667a3b6497a1cdb2d57a081d4210226)

commit cc80d91db4b0756241bbde7e3deb7f6bc90c9ae2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jul 4 12:57:37 2012 +0200

    macosx: fixed window button alignment when using the black UI mode
    
    Pointed by Damien.
    
    Manual back-port of f836a238bae817640c4f0a1b1c5289241e181eaa

commit f4a16defc1896b971ed31c2c63e373a94cd80689
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jul 3 15:06:00 2012 +0200

    macosx: fixed time slider alignment issue
    
    Pointed by Damien
    (cherry picked from commit 20484554dc35aecc15fdb8c492d6a9ad591c5695)

commit 198838bc23cee2375609eb886d2bdc11d148df7b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jul 1 13:50:34 2012 +0200

    Update Qt to 4.8.2 from qt-project
    (cherry picked from commit 97646e602b530224117fdfea2f35677a038f7c86)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2e6b25b00a3fe5d980ba8d16b90b525bf6e4cd48
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Jun 30 18:33:31 2012 +0200

    macosx: improve accessibility support for black ui
    
    The commit adds additional attributes to the black windows in order to correctly
    link to the close / zoom / maximize buttons. This is needed to get some
    tools using this api to work, in particular / e.g. jitouch.
    (cherry picked from commit 73b270549bb441dd2f273f93d492239b459f1513)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 931e469edd24dbd5504a5476c8db622d8a96a664
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jul 3 13:14:22 2012 +0200

    extras/package: fixed package script for OS X
    
    (cherry picked from commit e996b4b4a3cc017cea89f85fa2d80aa165d882b9)

commit b9ada9b92d9ecd3f93b6767bb696fab1c95eccdd
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Jul 3 13:28:20 2012 +0200

    macosx: fix handling of shortcuts which include shift
    (cherry picked from commit 837e3ea601dc4d84c66dacd0dff5a8a250b9302f)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit ba9cae3ae9f4ed32c9f1ba72664996a6891355e4
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Jul 3 13:29:54 2012 +0200

    macosx: change handling of arrow keys slightly
    
    When the key is assigned to an main menu item: In this case the event
    is never passed to the controls, so we want to handle it here for these
    exeptional cases.
    
    For all other cases: The event is ignored here and handled by the controls
    (playlist, or video view, which also sends it to vlc core).
    (cherry picked from commit 0ccbaa821f8b7b928c651df53db5ad50ed246b83)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 2752db79396f332a187689a60bfcf6b1fe83b4fc
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Mon Jun 25 11:15:57 2012 +0200

    dvb-scan: fix potential buffer overflow
    (cherry picked from commit 396a1e896ff7307e721d5cfd616a55bc2fd950df)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 4cfc4e981e706f1b220c102899ec469ff00c2857
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Mon Jun 25 11:19:05 2012 +0200

    vcd: fix off-by-one while scanning
    
    scanf("%Ns", %buffer) require the buffer to be N+1 long.
    (cherry picked from commit da89d251fc076b1df3b0d8ba5987e16371a1a59a)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 40cb29d9047cd3569fc333c2129050b494cad8b0
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Jul 2 00:40:05 2012 +0200

    contrib: taglib: don't crash with strange files
    
    Close #7036
    Patch sent upstream
    (cherry picked from commit c7f19291e969c9035c098b4aa4af9c52c8bc7aae)
    
    Conflicts:
    
    	contrib/src/taglib/rules.mak
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 5eaac683e14b7d1bff093f1cd5484186f4e684ee
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Sun Jul 1 01:38:27 2012 +0200

    macosx: fixed font selector panel on certain setups
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 1bff0b7fe088ebbb50837b484df44c9f4467526b)

commit 10bab14cd8fa24b552f4ad7bf7d1da54f5b162e4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jul 2 14:21:58 2012 +0200

    NEWS: added some Mac stuff for the next version

commit ec768b24052cda1aecd8db8c35d1f9d224288e27
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jul 1 20:40:25 2012 +0200

    package/macosx: enhanced the codesign script to add a designated signature to enhance its compatibility
    
    Note 3 things
    
     - the included hashes are common knowledge, non-exploitable and hence don't constitute a security issue
    
     - you need a valid Developer ID private key to create GateKeeper compatible signatures
    
     - If you don't use VideoLAN's Dev ID, that's noticable but doesn't limit the app's behavior in any detail.
    
    This commit also limits the signing process to the compiled lua scripts and no longer signs the entire lua folder since this would limit the usage experience and it isn't reasonable either.
    (cherry picked from commit 41e20140b3bd4482cb02fe6eede5da471e57859d)

commit ab8a0eba54e73bc3d7cf943eef34c36032e969fb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jul 2 14:20:22 2012 +0200

    On the road to 2.0.3

commit 4848daf2925a93307643283f958b07d3423eb2de
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 2 22:25:58 2012 +0100

    Qt4: negative days for updates checking makes no sense
    (cherry picked from commit b85cc5537812613a2988651c851b08fa34b7516a)
    
    Close #7040
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 025b279e9ece73371fe69fefda2fb959aeba409b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jun 18 17:52:08 2012 +0200

    macosx: added a basic script and some entitlements to enable Sandboxing on OS X Lion (refs #5149)
    (cherry picked from commit eba61d4f3b94f0539c5e250b3222b24c543b67be)

commit 470a346767b0d8473128b47913c16878fc477d0c
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Apr 29 14:17:56 2012 -0400

    contrib: update Qt4 to 4.8.1
    
    cross.patch update by John Freed
    (cherry picked from commit cd0148a5a1d5e5875f525c04225add1975a9dd78)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 03bc4b50aa8c64ec90da812bf3910d47a2085f95
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 28 09:47:20 2012 +0200

    macosx: fixed broken fspanel background (close #7024)

commit b2ce9b7182a928f2f4bc24e2c98c78c9d20d5ff4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 28 01:31:19 2012 +0200

    Makefile.am: fixed make dist by removing references to future files

commit 6150e7774d153a95b966198f20974c4a50e3ea8d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 28 01:22:47 2012 +0200

    contribs: slightly update libav/FFmpeg since the last hash failed to compile on Darwin for x86_64

commit e8c15f6081b78e543f5db13f2daaad554d3a2a54
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jun 27 20:06:45 2012 +0200

    macosx: fixed names of 2 retina graphics
    
    manual back-port of 44cdb9b3254ce051e05cb26cef6b78bf501f3427

commit bc2c368b1c3c2ddeaff7b9cb61f0a157f612ed1c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Jun 27 20:02:05 2012 +0200

    macosx: open panel: set mrl textfield as noneditable
    
    manual merge of 3194c5215695c69ff67b40a369fa5e2bf0336a74

commit 584c4ebb39b0c493b20965b89bdfdf1c7b31bc68
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jun 24 14:09:36 2012 +0200

    macosx: disk open: do a shallow instead of a deep search for media directories
    (cherry picked from commit d86de10ce6a52c523dc33848b4f36fe22b5a7bb6)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 478d3fcd61c9f89c0f2c38a34f58ea43647b054c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jun 24 10:51:38 2012 +0200

    macosx: device open: set new media folder as current item when it is added
    (cherry picked from commit ad09e6fbfb12153fd79cc5256b33407fec3309b8)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 31f4c4db0beabfb571aa31d6834f988111e1dee1
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jun 24 01:26:30 2012 +0200

    macosx: fix bug in disk open panel regarding selected folders
    
    Previously, the open panel always converted the mrl to an (not available)
    mount point when you want to setup a playback without menus
    (cherry picked from commit f8d14c628d05db37c286cc48ad44a2555dd53639)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit bdd4d52f11a933c5f37ad420c64b8be455dbbfa5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jun 27 18:59:30 2012 +0200

    macosx: fixed long-standing issue of disappearing sidebar item icons on some build configurations
    (cherry picked from commit 0664335b7e32ea96e0f57880c5a056f7847f2d7a)

commit d1b4a6390b11b75a7a3de0c6b761cbe9294438c5
Author: Damien Erambert <damien.erambert@me.com>
Date:   Wed Jun 27 17:16:56 2012 +0200

    macosx: added retina compatible sidebar icons
    
    manual backport of 04d65ac9c8d807dad15a6480aee70c8fa3f0572e
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 6b57db3b9ba65c58185395386ec7a45a00aafd31
Author: Damien Erambert <damien.erambert@me.com>
Date:   Wed Jun 27 17:15:31 2012 +0200

    macosx: added retina compatible fullscreen controller artwork
    
    manual backport of 554813d647b3bcf07bf96695b4de8961ee860209
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 04335f03dd4f824661239e6305e86b03f0898bff
Author: Damien Erambert <damien.erambert@me.com>
Date:   Wed Jun 27 17:13:47 2012 +0200

    macosx: added retina compatible artwork for the gray main window style
    
    manual backport of 8ba3d7f4ddefce1678dfbfbe381d38184e3b3393
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit dd19842eacec0cce2f41b4ace43661471563dd1a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jun 25 01:27:05 2012 +0200

    macosx/fspanel: another minor optimization and simplification of the image drawing code
    (cherry picked from commit 3d7bdcde683a3a0845bf8d441d18a9cb539e1d5d)

commit b89922682e75695e4a56980ef80fb2731c114608
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jun 25 00:48:48 2012 +0200

    macosx/fspanel: optimize image rendering for sliders and background
    
    no user-visible change.
    (cherry picked from commit 77442ae2072b81c5a6ec0e5900a15358adceafe1)

commit 7c65ff1c773ba166bd256ba5c055c1d2610d3a45
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jun 27 17:08:30 2012 +0200

    macosx: removed the fspanel artwork for scale factor 1.5
    
    This is a broken concept, since according to the HIGL, one point always equals one pixel on non-HiDPI screens regardless of the actual DPIs or the actual screen resolution.
    
    Additionally, this interferes with our support for HiDPI
    
    manual backport of e5c027058bb8cb97872e082fab382089c2d7997c

commit 488dbe3f63ea2e1e46b7981f64d9f427c4d7e3c9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jun 27 16:53:24 2012 +0200

    macosx: updated xcodeproj and Makefile.am for the new graphics
    
    manual back-port of d8b24e50f5a53e9973fea963ba07962108725247

commit ec867b1b0415168407de9b1f0529829726d155b4
Author: Damien Erambert <damien.erambert@me.com>
Date:   Wed Jun 27 16:49:17 2012 +0200

    macosx: updated volume and dropzone icons
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 244a84e264e0e9a9d60164a62d2f41addefc63b4)

commit d1bf0221559cff70168e60f3151f4f43ea28723c
Author: Damien Erambert <damien.erambert@me.com>
Date:   Wed Jun 27 16:28:36 2012 +0200

    macosx: macosx: added retina display graphics for the dark window style
    
    manual back-port of 2ce6916bdd9d6d82cadf46d23bf1532dcc24acc6
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit ceb4fc4e1d12c84caafb39bd4cb3ad2c84feda96
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jun 27 01:52:30 2012 +0200

    Update NEWS

commit 7e775c71d8a7f627cec41cc023ba3411a63cd2cb
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Jun 26 22:50:05 2012 +0200

    macosx: improve resize behaviour of splitview
    
    Now, the sidebar will not  will not resized while resizing the window.
    Also, this commit sets a min width for the the sidebar. But it can
    still be hidden, just drag the slider to the left.
    (cherry picked from commit 0f4b97b08a1805c6c72f94dbfcbebb61bf956bb8)

commit 43b1fd9951c4b05b01a1a59699413622d3bf10c1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jun 27 01:22:42 2012 +0200

    Make update-po

commit 78c7fea4b522b56edbbee3d18a9000324f5ac912
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jun 27 01:09:48 2012 +0200

    Contribs: update FFmpeg

commit 40d9fefb620525ed2b96043d4dac1767cd1d6523
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jun 27 02:39:33 2012 +0200

    Revert "DirectSound: apply volume attenuation with DirectSound"
    
    This reverts commit 999a7af728544436952c0fa6f99ae2c3249cca44.

commit 00ae211bc43f1624dd1bd2dba85e145c473e26fd
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jun 27 02:39:21 2012 +0200

    Revert "DirectX: 10L fix compilation of backports"
    
    This reverts commit 7be07b1a0ffb1a7f5c091d16de5e6d6b32b540f9.

commit df8462b3924c74c2e10ceb65d9504ef0c8d387cc
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jun 25 16:25:15 2012 +0200

    Win32: fix compilation
    (cherry picked from commit 95da9d5aa0b67f269de4d62c3c098755d2527d81)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 268359b7dae3e6d83a4e35c812ac2cb6536e0138
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jun 22 00:26:23 2012 +0200

    macosx: work-around a weird bug which let the drop zone respond to mouseDown events targetted at the window title
    
    Thanks to David for the report
    (cherry picked from commit bbb30ce0e0b9ff526865ec126f370056bbf8735e)

commit 380e40213b2dcd8116bcc5efb8556a008aae42d8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 21 17:49:11 2012 +0200

    macosx: fixed custom revealInFinder implementation for files stored off the startup volume
    (cherry picked from commit cac887503093923b11a0240490aed69c09152262)

commit a168e79bd412d72ea73ffbbb51be92ed96f4800d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 21 17:52:05 2012 +0200

    macosx: reimplemented the right-click Reveal-in-Finder feature on the window title when using the dark interface style
    
    manual merge of ce2b23f7e82e4571d59eb90428641e00df9560e0

commit d34449153e9e121273dc07df27d22fbb928ebb8d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jun 20 08:17:26 2012 +0300

    directory: do not get stuck on a FIFO (fix #6940)
    
    Also avoid fstat()+close() on non-directoy files.
    (cherry picked from commit f9812a51e64e0777fa847fdf51f00fb500d2e1ca)
    
    Conflicts:
    	modules/access/directory.c

commit da7b4234c23c113013903955bd21be1249db195f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jun 20 08:16:16 2012 +0300

    file: do not use non-blocking mode when unknown/unspecified/useless
    
    For FIFO and sockets, non-blocking is wanted. For character device,
    the effects depend on the device driver. For other types, non-blocking
    mode has either no effects or is unspecified.
    (cherry picked from commit bd19904c7d2ab50b83d98c64244cb0d54ff46da7)

commit 95870a606fa60a45be516e389051ff168de2fdd4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 19 01:26:03 2012 +0200

    macosx: allow the user to minimize the main window by double-clicking the window title when using the dark UI variant
    
    This respects the system preferences' global setting.
    (cherry picked from commit fe7d94473216228c8f9667e1d476bfc54e771153)

commit 42a8f9586742565701ab39bb818042c3a0267684
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 14 20:32:25 2012 +0200

    freetype: fixed crash when looking for an empty string as font name
    (cherry picked from commit 48ef1e2f2aef23129661aba070e31832012dec2d)

commit 03d85649a64b40e63ade493be2f8930e78bd00fe
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 14 14:50:06 2012 +0200

    macosx: draw vlc.icns instead of a bogus white png with an icon in the about panel
    
    no user-visible change. However, we save 29KB and don't need to update that graphic for HiDPI
    
    This is a manual backport of a574f2f9052027ccd279e0431f7ae625e351cad7.

commit 07ef9fa5e1beb7a0fa879905b9eb9496ec13bbf6
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jun 14 14:41:21 2012 +0200

    macosx: Cocoa cannot deal with 2 images of the same name in a single bundle even if their type is different
    
    Hence, rename one of them.
    
    This is a manual backport of 6051f82ac2a50ce9210ab8ffe052b2784952d18a.

commit 1a7fbfcdd59bf2775617ed1e28739dcc1034f47f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 12 18:50:48 2012 +0200

    vout_macosx: added HiDPI support
    
    (cherry picked from commit af3a690427169763749987475727b0e37a6b6211)
    
    (cherry picked from commit 405a83cda0fc0f45cd4851bed7cc1d525f6d8fa4)
    
    (cherry picked from commit 4b2e143fa82231ecf563a8cb133edcc0839b4e1f)
    
    (cherry picked from commit de9a7b4f9a61257dff5880b6543f79c13c502aad)
    
    (cherry picked from commit f23389df0f358ec05ed0483a91cd4cfc56f867a5)

commit c67061862d6747cf34298d991a3dcc6e7732e249
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Jun 11 18:08:33 2012 +0200

    macosx: add multiple files dragged to dock icon together
    
    close #4358
    
    (cherry picked from commit 13e2c3bdfba86c9a1400deb9b14e201bbb40ec9e)
    (cherry picked from commit cfaaf916909b5483d6128cd6cd9b36deb72779df)
    (cherry picked from commit a89495bbddc454522e777a2f8abf2cb90424787a)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit a591abb61a25487a5f780cc467e520b1fa89b756
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sat Jun 9 21:19:33 2012 -0400

    contrib: freetype2 location changed
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 8358b4e7a27cb0ed9382093225f6d900ff368a4f
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sat Jun 9 21:19:32 2012 -0400

    contrib: flac location changed
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 567e06eb5c639f794413191008b5bf6afc55f9b6
Author: Ludovic Fauvet <etix@l0cal.com>
Date:   Sun Jun 10 05:36:11 2012 +0200

    qt4: the verbosity can't be higher than 2
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit fd06d5c1432e3e10239e5ea896d8838764ff4812
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Jun 9 22:25:20 2012 +0200

    macosx: fix longstanding bug where gray title bar shows window as inactive every time a movie is playing
    
    (manual merge of 62fb76aa32f6a060834da3c0f08066d51cb92ef8)

commit 701d1347faa29f52b0a04c587724deb6de1ae28e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jun 9 11:50:48 2012 +0200

    opengl: fixed playback of 10bit content on Macs with OpenGL 1.4 drivers, notably using the GMA 950 chipset (close #5973)
    
    We do so by forcefully disabling the 16bit shaders, which the chipset pretends to support, but actually doesn't.
    (cherry picked from commit adcc3b14a16c712af51bfc9b7940921a9e6b3468)

commit 7f0418af890720ff0aeddd94d9738692c2cd8ecd
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jun 7 16:49:49 2012 +0200

    Update PO

commit 6513c53e831b645a129422429c7c2e49f6ddb79f
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Thu Jun 7 16:27:13 2012 +0200

    qt4: save and restore the position of the GotoTime dialog
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 1d6ed61ee96ebdc1d462cd70ea4bb733774369e3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a08738984e6d5db15fda68ad8844a0e7ff479a33
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Thu Jun 7 15:06:53 2012 +0200

    qt4: never disable the "Jump to specific time" menu entry (fixes #6669)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 33299a4d5e3e6951b9039b929205abf6f5847697)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e8520a16a1facdd057011d9b93d9dc25e4834c45
Author: Ludovic Fauvet <etix@l0cal.com>
Date:   Thu Jun 7 12:56:23 2012 +0200

    qt4: fix y-axis positioning bug in the time tooltip
    
    Reported by hivolbill in the forum.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7be07b1a0ffb1a7f5c091d16de5e6d6b32b540f9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jun 7 16:27:56 2012 +0200

    DirectX: 10L fix compilation of backports

commit 73421943f853b7b1f3650785245258ae078543f2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jun 7 01:15:13 2012 +0200

    GA translation: fix string format

commit a538a1f9a666e40c612b5daaa5932491dcfd5d1c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jun 7 01:10:35 2012 +0200

    NEWS for translations

commit d6699a1f4ae27f04079edef946e2bf5a7fdb446b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jun 7 01:01:03 2012 +0200

    VLC is not the place for Kassdédi

commit f977b95661e686bd95151b88c2778d4048ea1bfc
Author: T. Chomphuming <jernghan@gmail.com>
Date:   Wed Jun 6 23:55:44 2012 +0100

    l10n: Thai update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 5b72806741eadbc60fb16341965de7e8f86c530c
Author: Dean Lee <xslidian@gmail.com>
Date:   Wed Jun 6 23:50:26 2012 +0100

    l10n: Simplified Chinese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit ce2a3491eb5c47a2f0de94a835d4034c8876c98e
Author: Oleksandr Natalenko <pfactum@gmail.com>
Date:   Wed Jun 6 23:49:36 2012 +0100

    l10n: Ukranian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 4b1e7f2aa8a23807630a0aa3288f522b73716954
Author: Praveen Illa <mail2ipn@gmail.com>
Date:   Wed Jun 6 23:45:51 2012 +0100

    l10n: Telugu update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit d56c15c3a01c535dc9308ea6d9013135055fa938
Author: Marián Hikaník <podnety@mojepreklady.net>
Date:   Wed Jun 6 23:45:18 2012 +0100

    l10n: Slovak update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 103088b11f1bc5f4fb21afac73b65c27a9175bb3
Author: Michał Trzebiatowski <hippie_1968@hotmail.com>
Date:   Wed Jun 6 23:44:10 2012 +0100

    l10n: Polish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit c12901218bfe8c2ddd2a7c9e95fc2296a9b307b1
Author: Thomas De Rocker <thomasderocker@hotmail.com>
Date:   Wed Jun 6 23:43:31 2012 +0100

    l10n: Dutch update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit e763441c2eb8411140c6a0daf60535cb08557c53
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Wed Jun 6 23:32:43 2012 +0100

    l10n: Japanese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit b54a8192ab61f03541283037ab5527d504b8ee30
Author: Vincenzo Reale <smart2128@baslug.org>
Date:   Wed Jun 6 23:32:09 2012 +0100

    l10n: Italian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 0d32820e2856b78972f1118d19e954665fb9a2a3
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Wed Jun 6 23:31:31 2012 +0100

    l10n: Hungarian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit fb5a4a71aa8e87363900f1d8b65d96b18f272178
Author: Gonçalo Cordeiro <gzcordeiro@gmail.com>
Date:   Wed Jun 6 23:30:34 2012 +0100

    l10n: Galician update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit ed178efddabef6e6ca13e26fa914b00d1136850b
Author: Seanán Ó Coistín <seananoc@gmail.com>
Date:   Wed Jun 6 23:05:41 2012 +0100

    l10n: Irish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit bf8d5c0e5d4425c541eda174323aa882808720bd
Author: Éric Lassauge <lassauge@users.sourceforge.net>
Date:   Wed Jun 6 22:47:54 2012 +0100

    l10n: French update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 5fa9470ca4d97335a0fa7570cb26e4f1c773a907
Author: Mihkel Kirjutas <turakas@gmail.com>
Date:   Wed Jun 6 22:44:21 2012 +0100

    l1On: Estonian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 8efa232a9e27033ebd926d67c8c7228f82fcf6f6
Author: David González <pico.dev@gmail.com>
Date:   Wed Jun 6 22:42:33 2012 +0100

    l10n: Spanish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 34d75237ff9a2b6f30c298b44c73fe6a8d9449f9
Author: Manolis Stefanis <mstefanis@hotmail.com>
Date:   Wed Jun 6 22:34:19 2012 +0100

    l10n: Greek update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit bb3049222def5f489c675d52993f73f032557971
Author: Denis ARNAUD <denisarnuad@yahoo.fr>
Date:   Wed Jun 6 22:33:19 2012 +0100

    l10n: Breton update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 0841fc7e99bff9644b49ad992c1a31069701cc42
Author: Сяргей Дар'ічаў <charnabog@gmail.com>
Date:   Wed Jun 6 22:32:23 2012 +0100

    l10n: Belarusian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit f4a44d365e26838988ab87cadea0aa4a775cdc0c
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Wed May 23 21:54:27 2012 +0400

    Upnp: Fix #6250, honor --miface.
    (cherry picked from commit 683ff74a9050c948b593490728cf400fcb10334c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 999a7af728544436952c0fa6f99ae2c3249cca44
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 6 16:34:10 2012 +0300

    DirectSound: apply volume attenuation with DirectSound
    
    This should keep the volume latency under 20 ms. This will break
    amplification as DirectSound is only capable of attenuation.
    
    (cherry picked from commit 39ee3d11eb7da54f58e42bdf2463cbaaa8661456)
    (cherry picked from commit a4e7d80196972f8f236219d51e2777c86fcb6aeb)
    (cherry picked from commit 0baa0d815b0d00574111af6a0275ee62c316b589)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 22098cd4db6cbf37875324de571c63aaf4e54693
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jun 6 23:09:32 2012 +0200

    Update NEWS

commit 9299dc60348d07d2b0a507d65d775e46414f99c4
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Jun 5 19:34:06 2012 +0200

    macosx: also round volume percents
    
    This prevent cases in which the percent value is one smaller than the
    previous adjusted value.
    (cherry picked from commit 5e06ffd4ca78ed08f5eea90e31b67b04b8f05abb)
    
    Conflicts:
    
    	modules/gui/macosx/simple_prefs.m

commit ea53ac4a2c6e39c9382a2df41dd8a0faf216a973
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Jun 5 19:30:15 2012 +0200

    macosx: change opacity slider to percent in simple prefs
    (cherry picked from commit f2bc92ad30a40c3ec1f20587863c8eee00c33e45)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit bf2dcfc3366509c2ff3b2a936029e0267decfdd9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 5 11:08:17 2012 +0200

    macosx: don't manipulate the selection when downloadCoverArt was requested (refs #6892)
    (cherry picked from commit 8de3a90b2be9bac51eff19200690214bd97a94eb)
    
    Conflicts:
    
    	modules/gui/macosx/playlist.m

commit 29eb0311152443d2fcfbbac0aa614a8ef754409f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 5 11:05:31 2012 +0200

    macosx: add multi-selection support to the playlist's revealItemInFinder (refs #6892)
    (cherry picked from commit 3dd486c8fe49c25f6bca2f93333cdcb83312e2be)

commit 2dfe7c350ee97ff6c5bd70cbd20700b4060dde4a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 5 10:55:37 2012 +0200

    macosx: add multi-selection support to the playlist's recursiveExpandNode (refs #6892)
    (cherry picked from commit 0e5226e0eeee223fb5e8e7c33e1fa36f3c4f5e62)

commit e2769a9bf1807b18d2ce30c3aec9722a81b946da
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 5 10:44:52 2012 +0200

    macosx: don't manipulate the existing selection when right-clicking on the playlist table (close #6892)
    (cherry picked from commit 50962d72c11ff3a7c382e4d9314ef3dcba6e5eec)

commit 8b456a3641c3b3b31b2e0456e60898736327c20e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jun 5 11:19:26 2012 +0200

    macosx: fixed the 'Play' item in the playlist's right-click menu
    (cherry picked from commit 0d1ec0b0c1b7ce333fac03f4870dc414a8c0921d)

commit 18acb2b00755b252a7ae41b621221c77ef77fc45
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Jun 4 10:23:37 2012 +0200

    macosx vout: fix framing issue when video opens in detached view
    (cherry picked from commit 8405c0784c4e8f15ff6d38babc1dbfab61e9436c)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit b4a5fc7db91b80f8dce9345c675a21be7c8ea430
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jun 4 00:16:21 2012 +0200

    macosx: fixed corner-case in which the playlist table was displayed instead of the newly created vout
    (cherry picked from commit 208028660fe17278a04eafe0b05c3a715e069a71)

commit df908f831a56d50676969f787d1910ef24cf5143
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jun 3 23:40:37 2012 +0200

    MP3: fix validation of headers
    
    Should fix free format playback
    
    Partial backport of de7ab0663

commit 27921c393fb284faab4b9c1c5064f2c4a6c476c7
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Fri May 25 23:48:19 2012 -0400

    playlist: preserve first item when enabling random mode
    
    Close #4472
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a5a428df27a4752a79c503bbe14ce3d67c76b777)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1ca954f3d362ec77e298a9cf0870b50425147515
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Wed May 30 00:28:43 2012 +0200

    Fixed the value of DV_NTSC_FRAME_SIZE.
    (cherry picked from commit 4fbbd7cd097c4dcd2fadf705a2f28e3f0f9d5358)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d2fbc302dec84a3129f70e7cb647901290301b34
Author: Sam Lade <sam@sentynel.com>
Date:   Sun Jun 3 16:57:00 2012 +0200

    Bluray: fix playback when device is a symlink
    
    (cherry picked from commit 21e4928a6b98fd7b6bb520b5f1b863738a695295)
    (cherry picked from commit 3e7cc6f5762510082bc4e7301ad9a4ed2bb6de77)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2c5cab2aeba49d1a5d9ba2a067f191c6103e5c58
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jun 3 21:48:13 2012 +0200

    opengl vout: fixed chroma issue with dated PowerPC-based Macs, which run OpenGL 1.3 only and don't support the GL_ARB_fragment_program extension
    (cherry picked from commit ac5631c730899f750338b1e47335f2159e72d407)

commit a9b2cd97ffdef5b1119556b2b18fef6227d18e5d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Jun 3 16:50:25 2012 +0300

    qt4: remove ObjC++ hacks
    
    This should fix the build with recent automake (fix #6911).
    (cherry picked from commit fc55e4a1df2e691c73a28c6d6bc18143d60b97de)

commit 5bcf0809eb0f74066555225839d6f58c94cc88e4
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu May 31 18:48:23 2012 +0300

    v4l2: add v4l shortcut
    
    Anyway V4L1 is dead, so there is no ambiguity.
    (cherry picked from commit c7d276074d6f83580a4c5e6fb15699bcf92db227)
    
    Conflicts:
    
    	modules/access/v4l2/v4l2.c

commit 9fc774899f2e88f7a67c216307020be02d2b0e79
Author: John Peterson <john.peterson3@hotmail.com>
Date:   Sun May 27 06:35:02 2012 +0200

    MSYS build fix: escape backslash in whoami
    
    whoami need to escape the backslash in 'pc\user' otherwise src/version.c can't compile.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 126d1ccc2c3d3faf6ec8e2bf53bae73273025098)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 80879ae6cb06eea6def03ce82e9d201595f2c489
Author: Joe Taber <infogulch@gmail.com>
Date:   Sat May 26 16:53:33 2012 -0500

    vlm: Error loading /requests/vlm.xml
    
    Variable `loop` was uninitialized and resulted in an error when being
    concatenated. Initialize the variable to blank: `local loop = ""`.
    
    Close #6882
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a75ff33f2b426ffe02994b65a84cf70f178b1aee)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8ee155f5685ce371d283af906c855d6620f8ae9b
Author: Chris Smowton <cs448@cam.ac.uk>
Date:   Wed May 30 14:30:54 2012 +0100

    Don't reset current HLS segment playback pointer on a failed seek
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 78baddd08043b952cae3ed973b8d7a561c7ba493)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0879b3f6a769d1a13f96d83c3cbff4d10952c8cb
Author: Chris Smowton <cs448@cam.ac.uk>
Date:   Wed May 30 14:30:04 2012 +0100

    Fix trying to prefetch 2 segments from a 1-segment HLS stream
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7e21f34f1cf7fd9f3c9d73b5b39d7c671101d22c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cd7ab6ee4c2affc20c0eecb3957b6f12c7ff41cd
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Wed May 30 11:50:00 2012 +0400

    m3u: Check Content-type if available.
    (cherry picked from commit 0e3e2b84b9c0891f9496b39184d2adea9fff4117)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 343aa93de8c7ff721fe180383a56d1c703813434
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue May 29 10:49:32 2012 +0400

    m3u: assume m3u with BOM at start as utf-8 encoded.
    
    X-Patched-By: Sergey Bolshakov <sbolshakov@altlinux.org>
    (cherry picked from commit 75a167f5b377a1edba3e1bf0230af05da7974347)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 47034c142b21c438d3e5ca85ddf0a06e5d69c63d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 31 15:00:39 2012 +0200

    freetype: in case the provided font name is neither found by name nor by family, let ATS check whether it is a correct PostScript name
    
    This fixes issues with some Asian fonts as pointed by Naohiro Koriyama
    (cherry picked from commit e943ace33cce82c1a59b67000f2fbd99ff54130e)

commit dee1ee38cf21057cfddb06be95c21d9917b57894
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 31 14:54:12 2012 +0200

    freetype: provide a proper fix to prevent ATS from crashing when searching for the font family instead of the fontname
    (cherry picked from commit 10e87394ea679dd8bdabc582d4f83ca90f9e8c40)

commit 89bb8968fa0d973be81c6def9a94ca05b48b2e41
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 31 15:02:48 2012 +0200

    macosx: set 'freetype-font' to the postscript name instead of the family name
    
    This fixes the freetype ATS lookup for some Asian fonts such as Hiragino Micho ProN with multiple weights.
    (cherry picked from commit 26303bddc76d9b5a29767b77d44b8fbece932092)

commit f00c824bb9a2001ae0160326bd0fb173873f4280
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed May 30 20:12:01 2012 +0200

    growl: fix crash and duplicated notifications in some cases
    (cherry picked from commit b10e58173a1190b06cd8826147cc8ac36b04d9a3)
    
    Conflicts:
    
    	modules/notify/growl.m

commit 218e94e7366e835e6c6dc8581e2134be2d38a211
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed May 30 18:56:40 2012 +0200

    updated NEWS wrt ATS lookup within freetype

commit 962f11c20cdcd002e10d074a0d9416330c9cf496
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 28 02:03:00 2012 +0200

    freetype: use Apple Type Services to get the font file location instead of libfontconfig
    
    This API was deprecated in 10.6, but still works correctly on 10.7. CoreText is the modern replacement, but doesn't provide the needed functionality so far.
    
    (cherry picked from commit 9cee736f1276daa463bc6fa9127dfb9d5f52d957)
    
    (cherry picked from commit 763139653998328284518112904e0e8ec4d9b8d8)
    
    (cherry picked from commit 6938a98a430431a7d8f41228c60dd883b8264e6a)
    
    (cherry picked from commit 780bc86907509205c3d0335350aeed909a427a2b)

commit 6abf293779383854aaeb905e8bb19f7c73ba6acf
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed May 30 19:15:56 2012 +0300

    ALSA: force small period to avoid latency problems
    
    This is as already done a long time ago for PulseAudio. VLC might
    deliver audio a long time ahead, but there is no warranty thereof.
    So a small latency must be assumed for the worst case.
    (cherry picked from commit 894b9dfb3b1d3d5852cb0d52470d73c06be27b37)

commit 13f28a4e75f496e22b37e632c4d347fc0dd5873a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat May 12 10:05:16 2012 +0300

    ALSA: follow initialization order from snd_pcm_set_params()
    
    This should fix support for or work around bugs in, some drivers:
     * explicitly disable soft-resampler,
     * define access mode before sample format,
     * set buffer before period,
     * use period time rather than period count.
    (cherry picked from commit d80d6da77e3074d3ecc67fb70a8305d08f137f43)

commit d751400813e0717d30d35da639cd9de32cb8c544
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 28 19:35:09 2012 +0200

    macosx: lock the scroll direction for 0.8 secs, so the user can scroll through the movie or adjust the volume without affecting the other function (close #6893)
    
    This is especially needed for the multitouch trackpads
    (cherry picked from commit d34619d34cc2e93c02f66dd04b41f74a6ec4eeed)

commit 40ad28f76c9ed4243381bf4a30cecb0908d252f1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 28 15:51:30 2012 +0200

    macosx: optimize scrollwheel code by saving 3 objc selector calls per run
    
    no functional change
    (cherry picked from commit d9fb60bec03044bb7bc20e9a18d52f43f940b75b)

commit 5de326ba3c398719a66ef338573367e96d6642e5
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon May 28 09:32:08 2012 +0200

    macosx: fix some issues with playlist column headers
    
    close #6870
    (cherry picked from commit 01533a3cb5eece7f3e6638f51415df4909ccb6c7)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 93e5cfc7f056f85238f2971deaaba2d470844b3d
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat May 26 14:54:14 2012 +0200

    Enabled screensaver for win32 opengl vout (close #426).
    (cherry picked from commit d20acdeca0078e548a68491cd27e7413d5e5a4b1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93695a956e429cac34a6bb5747aac49f926c3773
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 27 19:51:35 2012 +0300

    adummy: do not create dummy audio-device (refs #6874)
    
    (cherry picked from commit 003ba60d1911a7f6a6a97aaf24324660f50b3959)

commit f48fde01f3ae673520744ba7189ed1e8896b7edb
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 27 19:50:19 2012 +0300

    ALSA: destroy audio-device at exit (refs #6874)
    
    (cherry picked from commit 3b0b4fb354db179353d4d319484f1711f979de58)

commit 8c341e8c37307b2b8fc9fbfa2ca5b4c40031cadd
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 25 18:51:47 2012 +0200

    macosx: remove now unneeded volume osd hack
    (cherry picked from commit 506ef92b9445bc3cf43dc5630c45958312e3cd84)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit bbb63fe93a69199a1a7f163a8effc3960200afed
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 25 18:39:01 2012 +0200

    macosx: several fixes and improvements for hotkey handling
    
    - volume and mute hotkeys are handled by core now, providing a proper osd screen
    - some fixes in detection if key combo is valid hotkey
    - fix for mem leak
    (cherry picked from commit 1536ed21be0f545840bf8b15e89e4f81fd1908a8)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit bff6ee5e66070829d66e21eae2ec11901a336128
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon May 21 21:20:04 2012 +0200

    macosx: fix subtile bug in initialization of mainwindow
    
    Currently, two objects of the class VLCMainWindow are generated. The first is alloated
    from intf.m (triggered by the first log message that arrives) and is initialized by
    both init and initWithContentRect. The second object is created from inside the nib file,
    and is instantiated ONLY with initWithContentRect. Therefore, up to now _o_sharedInstance
    had the wrong object and all calls to sharedInstance would cause problems.
    But somehow, o_mainwindow in intf.m is updated to the correct second object, although it holds
    the first object at start.
    
    Furthermore, o_fspanel is also instantiated through the nib file.
    (cherry picked from commit 0d847ccb8d2e58147fe351a10fc89e777f469fb8)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 6965b452713b2438b14fe41400aab0bef233addb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri May 25 18:34:15 2012 +0200

    Contribs: update FFmpeg revision
    
    Fixes MSVR 151, MSVR 193 and MSVR 195
    Finder: Jeremy Brown at Microsoft and Microsoft Vulnerability Research (MSVR)

commit 831357f75b81817e6fb0b49c6b6b729106b4bca5
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Feb 24 13:51:05 2012 +0400

    Contribs: libpostproc was removed from libav
    
    (cherry picked from commit 59c0cf6f125a5d6ddbb839adcfa31404c0043c89)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 193d387ae9bbdd1945f021f0481ef6fbfa622a81
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Feb 24 13:49:47 2012 +0400

    Contribs: add separate libpostproc.
    (cherry picked from commit 18faa622b2de2b94696d3de273704cb4a588bb3c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5d6b0f4829b88c5079b3b7cf7cab05b8380c3cba
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Thu May 24 15:49:23 2012 +0200

    Adding langcode to LINGUAS: Gaelic (Scottish) gd
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 18a808b6daa61f3eca5b454bf80acefea7317cb3
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Thu May 24 16:11:43 2012 +0200

    Mentioning Gaelic translator in AUTHORS
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 11ce6beb3c63a90158de0e5d0b3622efaec4c138
Author: Michael Bauer <fios@akerbeltz.org>
Date:   Fri May 25 00:29:54 2012 +0100

    l10n: Initial translation to Scottish Gaelic
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit e145eda539610e0deeb81e5aeead6ca0c747da60
Author: Dean Lee <xslidian@gmail.com>
Date:   Fri May 25 00:28:28 2012 +0100

    l10n: Simplified Chinese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 8d5c5e823a8f0225b13f914cf6e2665ed3b1614c
Author: Gaëtan Rousseaux <garousseau@voo.be>
Date:   Fri May 25 00:27:43 2012 +0100

    l10n: Walloon update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 6eb517dab30032db05d4edcad54b615611f171aa
Author: Marián Hikaník <podnety@mojepreklady.net>
Date:   Fri May 25 00:26:58 2012 +0100

    l10n: Slovak update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 506ebe0e098ce348569196410310a2e5581eaf97
Author: Michał Trzebiatowski <hippie_1968@hotmail.com>
Date:   Fri May 25 00:26:03 2012 +0100

    l10n: Polish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 63bd334195a76f58e6ac1272934c6e81b64c2f4e
Author: Khoem Sokhem <khoemsokhem@khmeros.info>
Date:   Fri May 25 00:25:02 2012 +0100

    l10n: Khmer update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 7ff7a19095ab1e0b9342985c0ee6ef92b4bab020
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Fri May 25 00:22:52 2012 +0100

    l10n: Japanese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 93bc2b2c896627e70ece5b05fc2711f36089f809
Author: Vincenzo Reale <smart2128@baslug.org>
Date:   Fri May 25 00:21:24 2012 +0100

    l10n: Italian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit b53a4670d9e4666af0d1853c4020a4eb0b5350c3
Author: Éric Lassauge <lassauge@users.sourceforge.net>
Date:   Fri May 25 00:20:33 2012 +0100

    l10n: French update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit ef2673c3081492a28f561a725446c08242904f86
Author: Tomáš Chvátal <tomas.chvatal@gmail.com>
Date:   Fri May 25 00:18:50 2012 +0100

    l10n: Czech update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit ad8aad84b930372ff578ec2fd04f824f658dac55
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Fri May 25 00:17:14 2012 +0100

    i18n: Update vlc.pot

commit 13752933868ecb088749bfd799118ed24301d25e
Author: Frédéric Yhuel <fyhuel@viotech.net>
Date:   Thu May 24 11:16:06 2012 +0200

    demux/mp4: do not demux f4v files for now
    
    This is a temporary workaround until someone add support for f4v.
    
    Work-around #4915
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f47133cbac88a1ef04e526df27eaa4e86a6f2d5a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6809c5dc7670fff8bedd3abdaa8faedd25d39de0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu May 24 13:32:52 2012 +0200

    AVI: be less picky about wrong sizes for LIST chunk
    
    Some muxers are unable to read the spec...
    (cherry picked from commit 164c7d31939a16674cd5c678e453085af2cbef4c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d9ca6136b67011f6807c093d46ac9ccc04849090
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Thu May 24 18:30:50 2012 -0400

    luahttp: Don't interfere with seek slider either
    
    Ref #6652
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4763a6a249a3280abe346b67238e8f9861a5999f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a778891727f1c1e7ebd2aabd2b8a3acd5b3dd02f
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Thu May 24 18:18:02 2012 -0400

    luahttp: Don't interfere while the user is dragging
    
    The updateStatus() function should not interrupt the user and reset his position while he is dragging the volume slider.
    
    Close #6652
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e91edd90eaf9cd4339b45fd90f8af4fe8a3b31b3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b657ffe1ab312f32a9fbf1d3c653ed69bd5dfe04
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri May 25 00:24:09 2012 +0200

    Update NEWS

commit 62b257decf22977e0a552b85fe3c2105db76f202
Author: Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>
Date:   Fri May 25 01:07:07 2012 +0800

    zh_TW translation update
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f352ed335818dce18fffd5dbf269f6da9fddda18
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Wed May 23 21:58:46 2012 +0200

    Hide errors with multi-part rar when the end of archive block is missing.
    (cherry picked from commit 8de46adc1189fe3a3ad7c127896ec026d9da3d62)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cb1c93f7831b1d24b41b224ce9af5cc14fbb66e2
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat May 12 20:59:35 2012 +0200

    Fixed support of G726.
    
    The bit per samples must be exact for the avcodec decoder.
    It closes #6799.
    (cherry picked from commit 59ae308b755d365655dca9ccccf9b738b1415f5f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8d8ca1d1439d6d8a2d87a1bfc73a13f806a52e64
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon May 21 11:44:45 2012 +0200

    AVI: read the creation date
    (cherry picked from commit da39be7b8045b28a744711f7a3482b7639325707)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f4f5913e32b5d526458bc5db0403ccdb4344509e
Author: Rui Zhang <bbcallen@gmail.com>
Date:   Fri May 18 21:17:32 2012 +0800

    httplive: do not reset segment data without key
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 533c3fda8892754017a26d2dfe3ef9d3cbb12dbb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b89e0273572cec446914321c781c402c9c35dd1d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon May 21 16:51:34 2012 +0200

    HLS: fix a signed comparison warning
    (cherry picked from commit a5b0a06c3a8a6c6276e172174405b40e6678b2a1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1c9c442340555cb165471ebbbe79285a038a8aa6
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Wed May 23 05:07:19 2012 +0200

    lua: fix more sd input options and lua stack use-after-gc
    
    Strings from the lua stack stop being valid after you pop them
    (cherry picked from commit 8f048e9cabebeec8b514e981993d16acfbbd7c28)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a27a39a740485ae78d7cf392274df8446f85f6f6
Author: Rui Zhang <bbcallen@gmail.com>
Date:   Sat May 19 20:59:28 2012 +0800

    Avcodec: disable delayed opening for packetized AAC data
    
    This is usually not visible, since you need avcodec+avformat, instead of
    ts/faad. Close #6847
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e0a4ac832b5214561944cd8212d7a94ad5d0ce87)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4446014f0c245bcac963e6deac8f34bfce375bcf
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri May 18 10:40:54 2012 +0400

    Bluray: use meaningful error messages when available.
    (cherry picked from commit d865085e438b4a2a8307a5e31bafffdbee048aa3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 86305775ed70368adb9f401b78fa93609947a046
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Mon May 14 14:16:34 2012 +0200

    lua: icecast: fix syntax
    (cherry picked from commit 8250e947f5708d7037078701706fa6d812b8b35d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7af7638bfe9593a38a8195392760c694137e76fa
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Tue May 8 15:09:37 2012 +0200

    lua: icecast: can fix radionomy's station names
    (cherry picked from commit c483441208358fe98b1edbde033b7a958767f8ff)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bf763ff9d12e8c287191dd9456cd461b164dbe61
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Tue May 8 12:43:45 2012 +0200

    lua: icecast: fix icecast meta import
    (cherry picked from commit 7f9b3efc8c7d347b28c8af9ba32043b7629c69fb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 74cedadc0ad778ccb44dc8bca138c3992a7bf2f3
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Tue May 8 12:29:26 2012 +0200

    lua: icecast: show url as alternative for unknown stations
    (cherry picked from commit 37fa606c9185246358d7a55184c28aa480523436)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d12af091b7295b6fe854a3f27fb7570e6dcf60f7
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon May 21 17:14:37 2012 +0200

    macosx: added forgotten method declaration in header file
    (cherry picked from commit 58fac8cfd783beffd1840ba688663268513aef83)

commit f3239670054a75bc151257a1224db27a73832c67
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 20:08:35 2012 +0200

    macosx: remove debug code and block Lion's fullscreen mode when disabling 'video-deco'
    
    Thanks to David Fuhrmann for the remarks
    (cherry picked from commit 5003db864a87d4d9a017939945df29b03bb76ac2)

commit e6d7a9db5c4e1221fea9969c1e270b2cb33a36f1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 21 14:41:05 2012 +0200

    macosx: removed the outdated and dysfunctional service discovery menu items from both the playlist and the main menu
    
    (manually cherry-picked from 5e8666c883f3653b6c9a1e1a94515947df17a20a)

commit b74a6a68c87100a81df5eb6699bd021d0fc4d6ff
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 21 14:29:51 2012 +0200

    mention 'video-deco' support in the NEWS for 2.0.2

commit 6fd52a255f27c62ccad6b3b7714ddc449fdb7e9a
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 18 18:03:16 2012 +0200

    macosx: remove one unneeded line in togglePlaylist:
    (cherry picked from commit e375b238a70d235f21d3a378c85bd4b8500c90e7)

commit 846b3c55de7ae1d8da302b894dce905a099bfd70
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 18 18:01:00 2012 +0200

    macosx: some small improvements for !video-deco
    
    - smaller min size (no need to have this big width here)
    - no black borders while resize
    (cherry picked from commit c2fe98bd7b3d87581a11c243c4ee85cc0ad912fd)
    
    Conflicts:
    
    	extras/package/macosx/Resources/English.lproj/MainMenu.xib

commit 49d1f5b71b36d77d63b2f4c111579d602f410470
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 16:24:24 2012 +0200

    macosx: added 'video-deco' to the simple preferences to match the Qt4 intf (refs #6426)
    (cherry picked from commit 2ea9ea1117ba6bae74f9dcf7f00e3188bf3a1eb2)

commit b778e2875f166f5ec38a464ae2f90aec4ab4a40d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 16:01:19 2012 +0200

    macosx: re-implement 'video-deco' support (close #6426)
    
    disabling this option will get you a separate video output window without any visible playback controls or window border. resizing is supported through hotkeys and Lion's native mechanism if available. Control the playback through menu and main window controller. Note that 'embedded' is obviously ignored in this mode.
    (cherry picked from commit f01f7eca64bd6f007afeaaeed623990e76a43de8)

commit 3d8d3fc897517ed1ac6a1f0ccbe0adb6e901d299
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 15:59:21 2012 +0200

    macosx: updated copyright headers
    (cherry picked from commit 298f3d05b5dc4a0aa464dc9df1ff5f30b9021d3a)

commit bc48ec2f7849f3fabe2121922c11d91ae09c7b21
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 14:21:15 2012 +0200

    macosx: another optimization for the wizard
    (cherry picked from commit 962d96bf1137f12810233e04feea1462fa09f6cf)

commit c31cacd2f556124d2f70345ebe31e71082d8861d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 03:36:01 2012 +0200

    macosx: more optimizations for bookmarks and wizard. no functional changes
    (cherry picked from commit 5ab6bfbd95919205b92770293c8046696c5b3ebf)

commit 6006454cee9f5b16691093cdf33c160c94a98e6a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 03:06:52 2012 +0200

    macosx: code optimizations - no functional change
    (cherry picked from commit 5f138ac2342473dba543d797c7592e6757289b05)

commit 3120c6377979d6328840c577b1e397962fe2a833
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 02:56:22 2012 +0200

    macosx: improve memory and hotkey handling (in case a vout is active, but not the first responder)
    (cherry picked from commit b3259ed4de03feded83222e6fe0837caabb8d20a)

commit 01e99e18ae3386e46e3df5596aaf47b10b4efc39
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 21 11:39:14 2012 +0200

    macosx: removed wrong check, which could make the video output disappear when leaving fullscreen mode in rare cases (close #6856)
    (cherry picked from commit 7100a8c8c8ba7364d5543c13ae70040a16aee17c)

commit 4a354598ff3230cd82d51ed154133e51d458c100
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon May 21 11:41:31 2012 +0200

    macosx: make sure that the fullscreen window is the main window (close #6850)
    
    With the previous impementation, VLCMainWindow will stay the main window in fullscreen and is accidently activated when closing utility panels.
    (cherry picked from commit f2092e1069a7bd65b7a8a99f4da513d06b352d5a)

commit e77f9d4e8e3ddf0ea3b1e8c0ee62f79799d6d6c4
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Mon May 21 00:34:12 2012 +0200

    lua: fix equalizer setting code
    (cherry picked from commit 71276f2b20747c9343b0741e117d3b480811df00)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 0fe515a30d8118e9edd7675fe0d0e506f476d04f
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun May 20 19:50:20 2012 +0200

    lua: fix memory leak in equalizer function
    (cherry picked from commit e52f2154aeb9260b08ca063d30d7f8739a3bf95b)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit a1a3464ce7565065d3055fa10cc5384419e32180
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun May 20 06:23:35 2012 +0200

    lua: fix memory leak
    (cherry picked from commit a754b0062dbfcd34a648842a2d8b53707ad6cfe3)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit f8640237cbc164d311f1c3f7212e86c033a6bca6
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun May 20 03:48:08 2012 +0200

    lua: fix memory and object leak and reset locale on error path
    (cherry picked from commit 31b5fbdb6d43462db5de00f13e910e0d9441ce3e)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 6430ad0454eb89cae09a7be46d7f89832440b02d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 18:45:25 2012 +0200

    macosx: fixed antialiasing issues in the Open panel (close #5778)
    
    (Manual merge of fa76779bd62abae33c22b2fa0a4cc44d05d055c7)

commit 49fad7ae9029bfd2384af242a821a3a58954eadd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 17:52:02 2012 +0200

    macosx: allow the user to sleep his/her Mac using the Apple Remote using the designated AR event (close #4383)
    
    This code uses NSAppleScript. Hence, it is likely going to be incompatible with the current sandbox implementation.
    (cherry picked from commit 9a73999a1f22b13051da16feaf54d8dd02e5bc80)

commit 041b88e4217ed7235fb40dff166fedf06281c81e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 16:14:07 2012 +0200

    macosx: use CoreInteraction code for the media key triggers
    
    no functional change
    (cherry picked from commit 8548e873e73f7e2838fee5e758eeb31ce158f5bb)

commit 9a59642da6d90bdf9ee0e90a8d0310353d9b426a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 16:08:31 2012 +0200

    mention the SPMediaKeyTap update in NEWS

commit 7b1aa1ca519a29381ad09cccb1eba1e0f625dec5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 16:05:55 2012 +0200

    macosx: using the updated SPMediaKeyTap, we can disable the controller on the fly and no longer need to restart VLC to do so (close #6613)
    (cherry picked from commit 0aaae8bd58be075548276b3696b9badb998da28f)

commit cfdad448fc7fc64c74b41e199002ea163f01b2be
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 15:49:09 2012 +0200

    macosx: update SPMediaKeyTap to latest code from upstream (refs #6613)
    (cherry picked from commit c6aa5ac9636a888923e4ae92faccbfbd399d987c)

commit d707f8f3072d8f58b5eba389272f5009f6375b1d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 18 15:20:17 2012 +0200

    macosx: set the represented URL in the detached vout window correctly (close #6836)
    (cherry picked from commit 9b56e18b3a577cb0f6615b355035f0f23e69b692)

commit ce58247d771dd3a4b57a68d0c800808e850b609f
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Fri May 18 06:08:37 2012 +0200

    luahttp: use us_tonumber() for commands passing decimals
    
    This fixes playback rate, track delay and equalizer settings.
    (cherry picked from commit fff364519a7723f98c7be6a507893e21efc6c2bd)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 6d85c42f7cb12b7cf7e4be24afe4efbd8315d80d
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Fri May 18 04:15:23 2012 +0200

    luahttp: make rounding function resilient to strings
    
    Because somehow strings are used to represent decimals...
    
    Fixes #6815
    (cherry picked from commit 78ee8bbd0478fda7ff55f8aa0d0a051be6784248)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit c84bdbdc42c91b8bb393687271c2d77eaf08cad7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 17 02:33:22 2012 +0200

    macosx: fixed corner case, which could lead to an empty main window in case the video output closes prematurely
    (cherry picked from commit 5c165066e19c1935de7abd8142deab531c0265ac)

commit 0de6f5420f9a1ab6fdb99c061eada09505793076
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed May 16 20:54:39 2012 +0300

    Qt4: use msg_Dbg() for tools panel items debug
    
    (cherry picked from commit cbdadbfb0e9f162f1a4151fcb056df56c9e67015)

commit 003bf14c9194195fa82504ea32694b39d4a8e3a4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed May 16 17:14:37 2012 +0200

    added growl update to NEWS

commit 980a9c2292d5acbf06e5483dd23f7b51f446a6e1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue May 15 19:34:40 2012 +0200

    configure: slightly updated growl header detection
    (cherry picked from commit 890ea0765894d32df2604f0d6d9b9e66eb2f8a37)

commit b77f3984fef0c06e7a6fc5ae0a7fef0ff3e96ef0
Author: Karlheinz Wohlmuth <kwohl@myopera.com>
Date:   Sun Apr 22 20:10:31 2012 +0200

    macosx: Growl notification plugin: use the Cocoa-based API
    
    Support for the NSDistributedNotificationCenter based methods
    was removed in Growl 1.3.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 999170bd706b7d56d50a40a032522be7a379746b)
    
    Conflicts:
    
    	modules/notify/growl.m

commit 6911754573f5b39640b13b745aa36d2f9bdd7ba4
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue May 15 22:19:34 2012 +0200

    macosx: fix another case where the user would see double negative time values
    
    Time can be greater than duration, when you scroll right to much.
    Furthermore, this commit moves the duplicated code into a own method.
    (cherry picked from commit cb98770db2ead84cb01568553ecc26839d9d85e5)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit c87880bc4e5a90febbfc348dfb01150a5d113632
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed May 16 17:51:59 2012 +0300

    PulseAudio: work around #5825
    
    This bug is already fixed in VLC 2.1, but the fix is probably too
    invasive to be backported.

commit 7127f328cc56c666df8f622f86602064fd54293b
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed May 16 17:31:15 2012 +0300

    PulseAudio: remove incorrect corking assertion
    
    It can fail in rare circumstances such as context failures (in other
    words, PulseAudio daemon crash or exit).
    (cherry picked from commit 5a0c690fb160d2b343b10eda8c986b8b4c7c531c)

commit 859509ab36239133ef05fe20d85a28131d87a549
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Sat May 12 23:16:00 2012 +0900

    Fix the problem that 'Open Directory...' does not work on OS/2
    
    fpathconf (_PC_NAME_MAX) set errno to EBADF. This leads vlc_loaddir() to
    misinterpret the result of vlc_readdir() if there are no more files.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 3cabdc21d79e61947800d7d7f6f729d9bdec647b
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Mon Apr 30 17:57:19 2012 +0900

    upnp: fetch all media items correctly.
    
    Close #6716
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 83a9c8442f393e4ada4c0cdccfebb41b67a17851)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e14d808ef8b6468f936f0dc9416eda620459064a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue May 15 18:03:40 2012 +0200

    Qt: correctly behave when customizing from minimal view
    (cherry picked from commit 1d8fd45bfad1a91ce2a623c2a301b8115e14f05c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5739701302076ec2efe42f42533112654f2a491f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue May 15 17:24:33 2012 +0200

    On Windows playing items like dvd:// or screen:// causes strange shortcuts in the user recently used folder.
    
    See http://social.technet.microsoft.com/Forums/nb-NO/w7itprogeneral/thread/02a71215-e308-408c-94a6-81f5a8e564a6
    for some information. The solution calls SHAddToRecentDocs only if make_path
    returns a valid path.
    
    Patch by anonymous VlcVelope
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 391bb3272583cbe41c5dfec60141b76e9fd61d0e)
    (cherry picked from commit 06ceac25f5d7a30ee585cb0f1c0b925f31234d74)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2e4fc3291adefaf15a46d751b759a8832bf92f10
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue May 15 17:22:13 2012 +0200

    Windows 7 taskbar buttons got lost after "video on top"
    
    This is not fully fixed, but it works after a state change
    
    Patch from anonymous VlcVelope
    (cherry picked from commit 1fc1506a8ff78d0ef8c5f8d2d77634ba6e8b4b12)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 632b91a9ac91501d35d8aa590d02f5f1c24d45d6
Author: Tobias Güntner <fatbull@web.de>
Date:   Wed Feb 1 23:46:59 2012 +0100

    Leave minimal interface if Esc key was pressed
    
    Close #5898
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6e3489732966f4b124b4d68a53988b593c08777b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e881d32041b4e51d6015af01ab45537e6398801d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue May 15 16:15:16 2012 +0200

    Qt: correctly handle mousewheel in selector
    
    Close #6812
    (cherry picked from commit 16c1b2916cf36a8e9c218ab856a62f289f6d2d80)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b3354a635282d80945645158f18b4701a36a21c0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue May 15 15:21:02 2012 +0200

    Qt: hide update check preference when !UPDATE_CHECK
    
    Close #6813
    (cherry picked from commit 88a69655ae94b045d84fd9d45daf155e1728a65a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f2a1e6ffe3080cdc69a99332040de89bc691bd4f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat May 12 02:10:58 2012 +0200

    Fix Stack off-by-one overflow in vc1 packetizer
    
    Pointed-By: Clément Lecigne
    (cherry picked from commit 08879e4e4284cd5359578731701195e5d19c2f20)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a8cc195912e60e5cc630762f8c7b2ed59a371215
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Sat May 12 16:02:26 2012 +0200

    Qt: main_interface: fix showTab(oldwidget) for undocked playlist (fix #6794)
    (cherry picked from commit 0ef62578e5b6e06e67868e8a9e2ac11d4436b5da)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2d044e476e1fb9f65ad93472468be378ff613879
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue May 15 01:33:54 2012 +0200

    macosx: limit the 'big' fullscreen panel to the 27'' iMac (refs #6383)
    
    an option to switch the modes is in the works
    (cherry picked from commit 81162e722f2f92e6415d7947416823486992b073)

commit d82f47cca0ab74769c7c62b7ac15358f67c8e669
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon May 14 17:28:02 2012 +0300

    Old RC: use vlc_socket()
    
    This avoids leaking the Unix socket to child processes.
    (cherry picked from commit cb11b7841319bd9017b76229291223c49b40d219)

commit c238e2a7e0eeff0ad851e20ee1e9fed0db3823a3
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon May 14 17:33:32 2012 +0300

    libvlccore: bump version and age (added function)

commit 7477aabc53bf31fb45c89dedbb09fde1e14d6907
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon May 14 17:26:00 2012 +0300

    Export vlc_socket()
    
    (cherry picked from commit 619b980ef0eb9b91fd45b2657d810c324401e0b2)

commit 592d02b7d955c8195b036d204fb2d2ac7bba2d44
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon May 14 17:33:11 2012 +0300

    libvlc: bump SO revision (event bug fixes)

commit 680dc5d7b1281d7a7a3bf7404dd2f753218b3d85
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon May 14 14:10:16 2012 +0200

    Qt: correctly fallback to filename when empty tags
    (cherry picked from commit 6acd0f4c54dcd69d029106c2465cba19d99ff24b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fca47b656a0d592d6ab66b380903b0609e0a5c3c
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Mon May 14 04:56:54 2012 +0200

    luasd: fix parsing of input options
    
    This is just a partial fix.
    Fixes #6148
    (cherry picked from commit 114a88bc426ee433e0d060c5d74caaaf10a7fab1)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 982e367ad862783392a9a71b2f79b8b8394ef86a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 13 22:31:02 2012 +0300

    caca: add Xlib initialization
    
    (cherry picked from commit 760668e7a6accb3046207b7ae426e509cf73dc7f)

commit 6abd243ff410dc5aa9352d208b8235f0989da670
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 13 22:30:11 2012 +0300

    caca: convert to automake
    
    (cherry picked from commit 52197b014bebfd9744aac4ad34f3e3d379abd53c)

commit 9795744865489a7e2427b2a4b7e2e6182213fb71
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 13 22:15:32 2012 +0300

    AA: drop priority to zero
    
    This plugin can cause VLC to crash or exit prematurely. Sicne it is
    mostly useless and mostly superseded by the coloured variant,
    lets disable it unless explicitly selected.
    
    This should fix LP#971106.
    (cherry picked from commit 5a772cbf7d490bc9cffa6c2f97c5fd2d3e30f068)

commit c151aa4da0bb6402c54af507c8af8739fefcab15
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat May 12 19:38:27 2012 +0300

    file: do not attempt to open(NULL, ...); (fix #6796)
    
    (cherry picked from commit 9984e74dbff847645ae0e63db96bcd249568b7a4)

commit 5704485522210ed7c28b9ed99dab0f35299e447f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri May 11 21:05:46 2012 +0200

    Update NEWS

commit fc6f188aef93d2562aefb26b266cf99407bb4edd
Author: Mark Lee <mark.lee@capricasoftware.co.uk>
Date:   Wed May 9 17:29:34 2012 +0100

    In libvlc_media_list_player_play_item_at_index() set the media descriptor on the NextItemSet event.
    
    This is now the same as was already implemented in the
    set_relative_playlist_position_and_play() method.
    (cherry picked from commit c64c794ee123b8a7d57682db6b753bf1dadec54f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7608b87208a5ce5448cae9d5c2774e958528c71f
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 11 17:31:36 2012 +0200

    update NEWS

commit dc0536c0fda865ed943d051867dc6e700a961f1c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue May 8 20:38:47 2012 +0200

    macosx: remove unneeded headers from videoview.m
    (cherry picked from commit deb8ae92650b4b112fada9b4c7b8ba3c71ed74d7)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 108e103e16bc56b99967b436da0df598afee5485
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon May 7 17:09:06 2012 +0200

    macosx: only show fullscreen when mouse moves inside window
    (cherry picked from commit da65be4390a8cbe466840f76d13965a4893bbd7a)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit d9f614d8dc913bfeeb29cbca82bc8c7962c74222
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun May 6 11:13:24 2012 +0200

    macosx vout: public getter for vd should not be needed anymore
    (cherry picked from commit 3b3a8924773effa59c8e85b6075fd8c659c6e39a)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit bb9653654b49d35433f033ac056916597c867a9e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun May 6 11:04:49 2012 +0200

    macosx vout: syncronize access to sys->place
    (cherry picked from commit 3d649ef6e18e0d13faf8deaf28eb17de55be5df4)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit a2ef7dad88de2d2a28fc8080438c49f34d06ceaa
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun May 6 10:50:34 2012 +0200

    macosx: remove unneeded p_vouts in videoview
    (cherry picked from commit a2347e5728d0c6749172f43ce40387338224103e)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 127ffb40b599ffd882d7d757c53ca9266cb8c792
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun May 6 10:49:22 2012 +0200

    macosx: avoid index out of bound exceptions in some cases
    (cherry picked from commit 2aa0ad9c3da62df3f31ff317bd747eb0b8524b71)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 2a025f5df901ed244ca7f540e8fc6ac98a9c5a11
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat May 5 22:10:53 2012 +0200

    macosx vout: avoid place_picture call for every mouse move event
    (cherry picked from commit dc5988addd4d36655fcbce3fbb39e817ef88dc1f)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 2ce08553100f19884a3ed68001045906f18383f2
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat May 5 21:54:59 2012 +0200

    macosx: move mouse vout event code to vout module
    
    Now it should be usable within own libvlc applications
    (cherry picked from commit 729e509f11a90d417a2f28c84b68d3648167142b)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 672577b7fda2be059a330de1578ac15b8d9c7f17
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 11 13:05:03 2012 +0200

    macosx: improve the handling of broken prefs and make sure that the user is unable to re-break them without using the command-line or a text editor
    (cherry picked from commit 4fac18958067cc3506413ae1d690910a1994506b)

commit 920c3a725864f70f0541a29ded9d6c612748c554
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 11 09:11:51 2012 +0200

    macosx: avoid some focus problems when doing playlistish stuff
    
    The original purpose for this code is fixed somewhere else today.
    
    close #6769
    (cherry picked from commit 0f0d47518b683267190256ae0cb5f4c403b306ea)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 347d28dec0ea91b878d0cc51e9eb215bf28db24e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 11 09:16:22 2012 +0200

    macosx: fix menu support in detached video window
    (cherry picked from commit 7ebcfcf446d55a29ea3dfe7783beea27557e83be)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 0f06b53238f4cc8e6ea7316aa24014b7c85ba8b8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 11 12:28:46 2012 +0200

    NEWS: added more details on an OS X specific change

commit 4a4dc98d75354f5571fc0183431a62f4bbe1293a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu May 10 23:34:14 2012 +0300

    subsdec: add CP850 as a character encoding (fix #6732)
    
    (cherry picked from commit 77a137de94267e120320dd1d2981e01d092e3225)

commit c4d228d601f8b9f8e08721285ac3f7a182699076
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 10 01:54:56 2012 +0200

    macosx: trust the user that s/he knows what s/he's doing when opening a VIDEO_TS folder (close #6108)
    
    in other words, accept folders which aren't named 'VIDEO_TS'
    (cherry picked from commit 0fff26bc5eb641f04b882b6830099b9bd267124b)

commit ab16815208f5f6b9bbcac95bdaf950ef4cf56d8f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri May 4 20:32:40 2012 +0300

    Do not include RPM spec files in tarball
    
    This makes no sense. RPM needs the package specification as a separate
    file, where the source tarballs are indicated. Chicken-and-egg...
    
    Besides those files are out-of-date.
    (cherry picked from commit ee3053e27485efc05856fd3574ab8daa65cfbd61)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 5ee93d74671abaf95ecd185bb7afe42de9a02fc3
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri May 4 19:27:11 2012 +0200

    Makefile.am: added more missing files to make dist (refs #6743)
    
    left out for now: cmake, ipkg and most of win32/UAC
    (cherry picked from commit 0fac96096c284eeaea307fa04caa6e1e6a6e6bf2)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 725b8162d624f5dae8aacfd3efbe082038236ec0
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu May 3 18:30:42 2012 +0200

    macosx: VLC.app shouldn't rely on a script included within VLCKit
    
    Therefore, add a copy to extras to prepare the VLCKit split
    (cherry picked from commit 72549b918f834891a40328ddf5fc40a59cbfd653)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit b6b349b4af2541dd6e0d221385274685fb2436ec
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 6 15:17:30 2012 +0300

    file aout: do not apply volume (refs #6262)
    
    In my opinion, amplifying the audio that gets recorded to a file may do
    more harm than good. Indeed, there is no direct feedback to detect and
    correct saturation or distortion.
    (cherry picked from commit 02a2074e054a237876a2c980621cbc0969dd72a4)

commit 9cca7f661b43a79b78cd8153393c829ae330f6d7
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon May 7 17:12:08 2012 +0200

    update NEWS

commit e0bb559e3fadbc6b6efdf909f693156775599e90
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat May 5 19:02:21 2012 +0200

    macosx: fix mouse position sent to vlc core for menus
    (cherry picked from commit 2d2cde172f10a5290956a115b35cf693a945e559)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 2cc0e83d2b742b0ddbc1c058e510cdce4b02dbd9
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 6 15:38:12 2012 +0300

    waveout: fix volume initialization
    
    (cherry picked from commit 9be0932d795076e8b33cfabb4a2d23042826025d)

commit 1aebb872ca34b207aab65c049b47fe63b02d2f41
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 6 15:13:39 2012 +0300

    News

commit c445d21eb26efa39a9cf061657a83e25b716a253
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun May 6 15:09:51 2012 +0300

    PulseAudio: correct volume reporting from PA to VLC (fix #6759)
    
    The proper reciprocal formula to that of VLC to PA conversion must be
    used. Otherwise, we get an inconsistent value in the "volume" variable.
    (cherry picked from commit a89517ca4be10847d17db539ed6acf5302fb65dd)

commit db7535e73e1d5df68d2e0585dbb1314a27559d49
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Wed May 2 10:44:16 2012 +0200

    skin2: call interaction_Register()
    
    The destructor called interaction_Unregister(), thus also call interaction_Register()
    (cherry picked from commit af9d16c530c407834497885916505a97c9aadb75)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a8a3f406da52584abee155c0eff5b9b0d6fc467e
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Tue Apr 24 10:45:10 2012 +0200

    avformat/mux.c: Check malloc return value.
    (cherry picked from commit 8fe6c20c7a040796758a684c54220a7a365b84b0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1c61401f52d08167688f65488605b945924344db
Author: John Peterson <john.peterson3@hotmail.com>
Date:   Sun Apr 22 06:35:02 2012 +0200

    rar: + Robust to non-specification header: Missing added block size flag.
    (cherry picked from commit 1fcf4a83a10cc1d668d5369682fe1f0330ac7e70)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cf2819b228390f6e74f55f97796e66d9d0303b02
Author: John Peterson <john.peterson3@hotmail.com>
Date:   Sun Apr 22 06:35:02 2012 +0200

    rar: + Support for up to 1001 volume old naming style archive.
    (cherry picked from commit 0ba86c3412976f39dc45caf11c64e2d8168aea42)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0c3e5b21f09947d3b49bc2805225b1f2a437160d
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri May 4 15:15:40 2012 +0200

    faad: Fix a crash when channel info are invalids.
    
    Fix #5433
    (cherry picked from commit 5db50265be1ba6537daa3a08ac368668bf1455b0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a6dd86b1d8ac1d883b3671b061329a43ea58f180
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed May 2 15:37:31 2012 +0200

    faad: Fix channel reordering loop.
    (cherry picked from commit e6050c742c28f3ba714cbadda19e11dab1cdd625)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 39e47aa2fe9129f7ccc05326d641c5220504adb9
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri May 4 20:24:57 2012 +0300

    Add missing events (fix #6750)
    
    (cherry picked from commit 0845bbed311a8fe510c0521d815fc976a98a4707)

commit 633d25f633d13ec789891c3718ae7a9962aa78fb
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri May 4 19:40:15 2012 +0300

    JACK: fix sampling rate (regression in VLC 2.0)
    
    The format must be initialized before aout_PacketInit().
    Fix Debian #664279 and LP#987231.
    
    Pointed-out-by: Walter Ösch
    (cherry picked from commit c028792ebaaa4579b2902e9c9e630a3a61fef3d1)

commit be2e926663715f73bce48dad99f4aa765988c4ef
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri May 4 00:26:06 2012 +0200

    macosx: fix another crash on exit
    
    (for whatever reason this was only observable on snow leopard for me)
    (cherry picked from commit fa3efbecc46ecb54900d2b0a060a80d001a321af)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 22376bb4bdc9b96b59bcbcd3c26c0cc28b8f1fcb
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu May 3 09:42:24 2012 +0200

    macosx vout: unify code style to the most widely used one
    (cherry picked from commit 3bd2a8eae1e4de4949f955c2da601280670e3920)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit d538309b82af1610760681044a65083355c9aa58
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 17:55:07 2012 -0500

    avcodec: fix avutil version check
    
    ffmpeg/libav doc/APIchanges should not be relied upon
    (cherry picked from commit 7f510436afb80e7c4bc4a563c7f385c7fb289749)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 474e7ac066a8d8078b80ea4295b36ae67af8912b
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 04:14:20 2012 -0500

    avcodec: don't include non existing header
    (cherry picked from commit b3a6617f9d6a0ddff58ec72871b02dbf98fb4f37)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 406d8298cf952caf9bd5de11b5a697aafded7c38
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed May 2 18:57:48 2012 +0200

    fixed typo
    (cherry picked from commit c9ef39b174c61db85f9e4cb8a69a1a2cce7ca4f9)

commit 2e18eefcb94a07ae883eb64536202c341e80d975
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 23 01:22:18 2012 +0200

    macosx: re-implement the 'icon-change' option
    
    Note that the displayed icon is a re-rendering based upon the original sources, since we need a higher resolution icon on the Mac.

commit 5aecdd4696d38b642ec5215fb5722988c0f4afa8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed May 2 13:42:48 2012 +0200

    fixed make dist for Mac (2)
    (cherry picked from commit b07f9ac1a626165e703a711df88e597906dade7f)

commit 7408186abb9778e839361141459ed96b4a7daddd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed May 2 13:41:12 2012 +0200

    fixed make dist for Mac (1)
    (cherry picked from commit 5e5d0aac07e960ea1d59a0209bf63aacb9dd8211)

commit 6a1bffebf06713091de725f42810068ed2441817
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed May 2 11:02:08 2012 +0200

    NEWS: update

commit f1618bf3a30b23c71c7d80f97f2644c616c9a443
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed May 2 10:58:34 2012 +0200

    Revert "Contribs: update upnp"
    
    This reverts commit f435727dc899df23a12d926258b3a8fcd6bdd524.

commit 16e9e126333fb7acb47d363366fee3deadc8331e
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Apr 30 11:50:17 2012 +0200

    ogg: Fix a heap buffer overflow.
    
    Reported by: An anonymous contributor working with the SecuriTeam Secure
    Disclosure
    program (http://www.beyondsecurity.com/ssd.html)
    (cherry picked from commit 6a41b030f5b7fcbe5ad7249c374172c0fdc29add)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7ef075a98444cab69410f4a1254a2bf5187be082
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Apr 30 09:01:42 2012 +0200

    macosx: small clarification regarding fullscreen controller
    (cherry picked from commit 37f24581df46af51482f3acf7df120522eec4d77)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit f435727dc899df23a12d926258b3a8fcd6bdd524
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 30 23:51:42 2012 +0200

    Contribs: update upnp
    (cherry picked from commit 1f3009e7c609c7446e4cec09b5121fa7ca7122a4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 69c65a067b8f17950af9e4293d1552d90e62a0df
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 30 23:44:50 2012 +0200

    Update taglib to 1.7.2
    
    CVE-2012-2396
    (cherry picked from commit 02a1c23e33c01f424b5d2c6de498baaeca2252a3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58b9a9aa44d74a3051cb6562eee281b610b57d61
Author: John Peterson <john.peterson3@hotmail.com>
Date:   Sun Apr 22 06:35:02 2012 +0200

    rar: Read the uncompressed size high word instead of the compressed size high word
    
    For multi-volume archives the compressed size refers to the size of the data in the volume rather than the entire archive.
    
    Signed-off-by: Laurent Aimar <fenrir@videolan.org>
    (cherry picked from commit 0ea07fba5ac7677c715664d370c85cbf8ce01d95)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 37fc3d99becc30a3517869c202b9725ef02311da
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 04:17:27 2012 -0500

    avcodec: invert definition of deprecated values
    
    We want to use the new names in our code
    (cherry picked from commit 6689109fee1f315dfc1931e5263e9a4aa6f8cff3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 167c370dc4355bf8f0f52b1b3a74cdc4f52e4b67
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 03:57:08 2012 -0500

    avcodec: fix build with libavcodec < 54
    (cherry picked from commit 1ed476774fee834da7b4dba4d38a8a41c1908890)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 117ea7ef90d5e8ef948646cdb198c80af7008b28
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 03:20:34 2012 -0500

    avcodec: revert define of deprecated values
    
    We want to use the new ones in our code
    (cherry picked from commit dd74923370c8be69b93eeff99582e9cb43812005)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit acce7567fa65a6355524e0ce185a0790858c4753
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 23 18:25:37 2012 +0200

    Qt: fix an annoying resizing issue.
    
    That was resizing when video was stacked in the playlist
    (cherry picked from commit 66b3569cecf9fb671e21bc672922295618971ef8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a703f24583c188ac153b7e5617ddb309323d8548
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Apr 29 21:20:31 2012 +0200

    macosx: do not display double negative time when duration is unknown (0)
    (cherry picked from commit 29442477ade3b0f18c2c0ae2a0da6c112beed4c0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 90eb56c808d63f36dcbd8eea71c7e48af551d8f3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Apr 29 22:44:28 2012 +0200

    Subtitles: avoid infinite loop
    
    Close #6720
    (cherry picked from commit 830c1cffef0b503f079ca9bbf93d86a58a9f926d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d7239098ffce302245d7dc87248baadae0cb08d8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Apr 29 21:40:17 2012 +0200

    Subtitles: font attributes can use ''
    
    Ref #6720
    (cherry picked from commit afdbf36588d83320059d400c9a7cf674a15ac257)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dd205d09b24d9404b34c95623d282e69bbea1829
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 27 19:20:47 2012 +0200

    MKV: fix meta regression
    (cherry picked from commit 57d06767e1efc8eeb9e606f23dfcbb5912f1f9ca)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 942bd31c390d819c41d5cdccfea70ee884cfa538
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Apr 23 19:42:33 2012 +0200

    macosx: fix issue where fullscreen controls are deactivated then video starts from lion fullscreen mode
    
    close #6351
    (cherry picked from commit 42f72172d84ba84b177e5bbec2115cc6ac3eaf4c)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 2c47fbb07df201621f9a53cff975b73b1d48a21c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 23 13:11:43 2012 +0200

    Qt: fix gototime focus
    
    Close #6670
    (cherry picked from commit 82694751a23d72056038800fc4e508377fed5c50)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5afe66f6d2d046bf6d2317992d1ea0e86696ce7e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 23 17:28:56 2012 +0200

    Qt: respect BD menu option when opening
    (cherry picked from commit c3f5043184787860f637b9603f3a7448cb0e7278)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3922b615aa750963ce9ee9b20c040208b78562c6
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Apr 22 13:40:16 2012 +0200

    macosx: workaround for lion fullscreen behaviour at startup (refs #6668)
    (cherry picked from commit 8d9646c187862a9816c943fdc42742e84ec236e7)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 8047362d4892903ef3260144cdbb598c62989b8e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 23 13:48:42 2012 +0200

    Qt: fix equalizer bands display
    
    Close #5980

commit b7c5ec050b75cae74c5eefbc5178482c496df5a5
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Thu Apr 19 20:23:14 2012 -0400

    Qt4: Set the current rate properly
    
    Close #6646
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 09b1ee4beca99b7cbeca161ccb738f70f358d744)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a7de3a62be724d04ca0a7c8658fee828bff85361
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Tue Apr 17 00:52:57 2012 +0200

    skins2: fix vlc sometimes crashing with drag'n'drop.
    
    This fixes #6599
    (cherry picked from commit 15b1a1b943752e8907dd4116096ff0299a0742fd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2da9586d6ec9614f7f7449cf5281c19e7e211aa0
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 17 12:35:12 2012 +0200

    h264 packetizer: Check for negative sps.
    (cherry picked from commit 09c2cc894e84a02326e382413f11b88b3c9c15e6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b144e25cfec4fdc7a06ef7f5ac86735b9a8e75e7
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 17 14:29:35 2012 +0200

    mpeg4audio: Fix a crash with some invalid streams.
    
    If rate stays at 0, a FPE will be raised in SetupOutput.
    (cherry picked from commit f5bc59c5a6f1b63d6468ba2d483252ecc6010801)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eea0990085a80a7eb96276663b00d7978d9695a6
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue Apr 17 15:20:24 2012 +0400

    Contribs: call pkg_static.sh from a proper place.
    (cherry picked from commit f340bff6580aad0f97c0f7513f8c6733fe82fc05)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4eca2eeb419e056725da7b276ebe6fc50c7b8b24
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue Apr 17 15:18:34 2012 +0400

    Contribs: mpcdec: don't build binaries.
    (cherry picked from commit 301f34dea49ac0d41ec1f7a1309a4707ca56ae97)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eb1cc862f063433b09231823007acd4275bd294b
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue Mar 20 17:04:56 2012 +0400

    Contribs: update libbluray to 0.2.2.
    (cherry picked from commit d34deb64c333d3d051a844be40a262836398cac5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c371aea09861d397dfbd179fe41b73ce3d57e832
Author: Adrian Yanes <devel@ayanes.com>
Date:   Wed Apr 18 21:45:01 2012 +0200

    lua: fix build soundcloud.lua
    
    Details: From Lua 5.2: Change to '\z' escape.
    Reject undefined escape sequences. The
    proper way to match the dot in Lua is %.
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>
    (cherry picked from commit 952370a42cfa481e3e5b0896c45a42bdd68e7f1b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6f3a5d60e69992367f07ae271f7cd48a99ed0464
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Apr 20 12:49:50 2012 -0400

    qt4 sout: replace AAC with MP3
    
    There is no GPLv2 compatible AAC encoder available today
    FFmpeg's one is considered to be useless crap (including by its authors)
    (cherry picked from commit 4323b8256cccdd92d656a7bb33f3f097cb6bd95a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7d428e056733cf9c779e66ce995c989dcf8b725a
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Apr 20 23:42:01 2012 -0400

    Abort installer with a message if a win64 installer is run on win32
    (cherry picked from commit 56b36ede3bd13b33708c601f7483279716d51128)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5fcefdc6de664858778f68d92aa279091a35a90c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 22:53:13 2012 +0200

    macosx: lion fullscreen: show fs controller not before animation is finished
    (cherry picked from commit 69d5d9aeaac87a57b67d18a98736066d77d06524)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 1dca657f2c6ca9efc29889a3f938d0ecaa1122d5
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Apr 21 12:49:10 2012 +0200

    macosx: fix lion fullscreen button in dark ui in some cases
    
    Especially this is needed when fullscreen is true in video prefs, but video has not started yet.
    (cherry picked from commit a0000ecec4d513724fd48f0d7df948fc0f389627)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 502aba9626535bd48ea019b1f434d687f147f073
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 22:41:01 2012 +0200

    macosx: make sure that window is not movable in lion fullscreen mode
    
    this is needed especially for black ui style
    (cherry picked from commit 2f6670cc6507ad451c4b1f5046d9b2d0ccd12d9d)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 0796e26c1240e24297ba686b87b7461718d7a53d
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 19:06:44 2012 +0200

    macosx: fix behaviour of toogle playlist when in native fullscreen
    
    - do not allow to collapse the window
    - block the playlist menu item for now, when video is playing
    (cherry picked from commit 44a764957d136977c9d7e1bd76cc3e4eb68e17d0)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit a237aae3b567248b45ad814cf97b526e99c9cd80
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 17:42:32 2012 +0200

    macosx: make lion fullscreen compatible with reworked vout module
    
    This also check if we should go to fullscreen at video startup (setting in video tab).
    (cherry picked from commit daceb54432580f1d18e27225b59d5a0720e48c8a)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit fb18bd76281a9dd709b3144ce859292160a4a47d
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 17:19:23 2012 +0200

    macosx vout: do not set fullscreen to false on start
    
    This would break fullscreen state when we are in fullscreen and another video starts.
    (cherry picked from commit f16e5943a6b3f89795469b215717168dfd9732fa)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 15c74510b4511ccc7589fdd8c05999bea7137eca
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 15:46:58 2012 +0200

    macosx: fix window sizing when entering lion fullscreen mode
    (cherry picked from commit 761eabba0b967a5c4e8ba3c890b1ab757c89e5c4)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 068886d24ddf89bf2c4b82280c0ab1172fa10085
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Apr 18 15:03:09 2012 -0400

    logger: fix HTML mode
    (cherry picked from commit 4644b706702c56fc6b54bfaccbcad7a4469a31fd)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 95fc07a96f5738312194ddc129729d641f400505
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 14:18:24 2012 +0200

    macosx vout: small cleanup
    (cherry picked from commit bbb54a75616ca1bffa6860bf23fa7cdc50e41d85)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit d70ddc7b8437b8102118a1de11c476ac4090c5e3
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 20 13:49:59 2012 +0200

    update NEWS

commit ff4917e750125b4174e770fc0c4991925c764863
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 20 13:45:54 2012 +0200

    vout_macosx: sync remnants with 2.1 branch

commit 31ef23429737248770d0a4756118291923188698
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 12:41:01 2012 +0200

    macosx vout: remove now unused method
    (cherry picked from commit 6999ff1d9b4d9e858b81dc1761bd1bf816143438)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 7c02dbf8a99ed5d828257f6c1c1f850d01bbada3
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 20 12:26:02 2012 +0200

    macosx vout: really fix crop this time
    
    ...hopefully.
    This avoids distorted images, and also preserves a correct ar, even on crop 1:1.
    
    refs #6080
    (cherry picked from commit 4a1c818c067a5481f06bcbcf0d7a5d7b56db1a8b)
    
    Conflicts:
    
    	modules/video_output/macosx.m
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit de233f9968c78c74bdb300c77b952eb550f75e38
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Apr 18 14:17:49 2012 +0200

    macosx: allow a smaller min-height when video is playing and currently visible in order to get more exact zoom behaviour
    (cherry picked from commit 884199d83044b4ce5b0a4c4ebb8896ae23cf4d96)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit db625849206b5e98c8b5f5a041529329d8dc4a9e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Apr 19 09:51:54 2012 +0200

    macosx package: correct prefs folder in README
    (cherry picked from commit 1930ef47a519522eb8c196e0561b1b8c837fb747)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 2f09592846d6b0e52ab1001c5853c65844bd722a
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Apr 16 11:00:00 2012 +0200

    macosx: remove black borders in black ui mode when aspect ratio is locked
    (cherry picked from commit 3aa0de6df1fefefa861e8f09f82dcc7d66375bea)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 654d89e8cadb207d409c1866a889729b1a818f82
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Apr 16 10:24:36 2012 +0200

    macosx vout: fix behaviour when macosx-video-autoresize is false
    
    Should be now the same as it would be in fullscreen.
    (cherry picked from commit 0d6fe822a85332701ab5052e5a460fd37b5ee9cd)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 55187d6fbba2a2f75b2cdd19fb4cc3e3fa2a0ab1
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Apr 15 20:48:11 2012 +0200

    macosx: move resize code from vout to macosx module
    
    Also, this commit reenables resize to native video size, if video starts.
    (cherry picked from commit 12b4d49591f5843bdaaac3d0c2f45193c65bdc62)
    
    Conflicts:
    
    	modules/video_output/macosx.m
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 8c87de1755f6761ddb3628ae0b0d44f5faa0f7e3
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Apr 15 20:48:11 2012 +0200

    macosx: move resize code from vout to macosx module
    
    Also, this commit reenables resize to native video size, if video starts.
    (cherry picked from commit 12b4d49591f5843bdaaac3d0c2f45193c65bdc62)
    
    Conflicts:
    
    	modules/video_output/macosx.m
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 07c2fc7c89c01a27be4115289028f22c35d19706
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 13 13:13:14 2012 +0200

    macosx: also notify vout modules if we go to fullscreen
    (cherry picked from commit 5769e0a402a4970a22f3073497f86ef4c5ed4a1b)

commit 94abe5a0f1ed3cc47d3757f19686ed98da93c731
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Feb 3 14:10:24 2012 -0500

    direct2d: link with libuuid
    (cherry picked from commit a234ac644c8cd60fca4bcc1894704b8ca8a394af)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 296fdee965379a4d1255d6f113a8aeffa4fbed45
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 1 02:48:48 2012 -0500

    Update workarounds for incomplete mingw headers
    
    The so-called "Vista/7 helpers" only define interfaces missing from mingw*
    
    Remove duplicate declarations already in all mingw headers, include the
    correct headers instead.
    
    Link video outputs against libuuid to get the existing UUID instead of
    defining our own.
    
    Define the C interfaces as Microsoft does it by using lpVtbl for the
    virtual table pointer.
    See http://blogs.msdn.com/b/oldnewthing/archive/2004/02/05/68017.aspx
    
    Define a C++ interface to TaskbarList3 for qt4, keep the C for video outputs.
    Define only a C++ interface to IApplicationAssociationRegistrationUI
    
    Define TaskbarList3->SetTabActive() correctly.
    See http://msdn.microsoft.com/en-us/library/windows/desktop/dd391699(v=vs.85).aspx
    
    ifdef the TaskbarList3 interface because mingw-w64 defines it already.
    (cherry picked from commit 9394c716596cdbcd91d483376f4cfbc936ddfa63)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit f33b24f49b19c55d1acb4474aa822ab89e6fc472
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Apr 18 10:28:10 2012 +0200

    Revert "network/io.c: minor fix"
    
    This reverts commit d6b589b131c993b96bdb17bd5d41cb36637a76e9.
    
    This broke mmsh radios

commit 576ebf38a2e43d760e3133b61676bbcae439994e
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue Apr 17 17:06:57 2012 +0400

    uk.po: fix "Leave fullscreen mode" translation.
    
    Closes #6644.

commit 5b4308ddbc540745560a1f25f990a0a8285e612e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 16 19:21:09 2012 +0200

    macosx: fixed memory leak
    (cherry picked from commit 2eab05e34ae0f580c25fde33c183bd9737c8aa3f)

commit cc884078cea14b8781f2cba539f3837fe5356990
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 16 19:13:07 2012 +0200

    macosx: fixed potential race condition
    (cherry picked from commit 5b8a40579cfbacb736484f4210f1cc93e9caf440)

commit 0e4a59ef90e2c2ad3c2949b3289e634f521bd02b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 16 19:11:34 2012 +0200

    macosx: fixed broken preferences on launch when starting 2.0.2 for the first time
    
    'control' and 'extraintf' will be checked for occurences of 'macosx', which, if found, in turn will be removed. Other contents of these settings won't be touched. Same for all the other prefs.
    (cherry picked from commit d864f1cac639f2a8a71727d37c8187de3e56d2ba)

commit 8c4118157e734d0d6367a53e6e969653590518e1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 15 15:55:16 2012 +0200

    macosx: fixed delete menu item for the playlist table
    (cherry picked from commit b54ea14fb14faa924b7353a4112ecab8c719b604)

commit 59947987d91dbae6fff33d02342976d1a74db073
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Apr 14 17:11:35 2012 +0200

    macosx: fix crash when open track sync panel while movie is playing
    
    Crash was introduced in 3e73ad2a8ab6d5e50ea80025d364edbe7ead1d1b (subsdelay filter) and
    occurs when user or init methods set subsdelay to 0.
    (cherry picked from commit fd9f59ec7cbda944c729118302c7434e5696896a)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 6479936163a78c204258c7a952f6c66a86005d0f
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Apr 13 13:25:46 2012 +0200

    macosx: unify code style for CoreInteraction.m
    (cherry picked from commit 8e6070daf4506090d0ab52dec97d3ca567ed0791)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit f7f95865ca3ea3a7732158783b3d70558f7a8f4c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 13 17:17:53 2012 +0200

    Update NEWS

commit 538988166e87de47619b4cc80521d98b9359c921
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Apr 12 02:08:30 2012 +0200

    MKV: Fix seeking without cues for clusters without I frames
    
    If no frame was found in the cluster rewind to previous seekpoint
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9561207ffd6e431d26dfde2c6b8353b146d9a77b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6cd3b780df808b067d409e2785c0b44cacee408f
Author: Casian Andrei <skeletk13@gmail.com>
Date:   Wed Apr 11 10:53:15 2012 +0300

    Qt: Fix ML "Add to playlist" adding items multiple times
    
    popupAddToPlaylist() didn't check for the column of the selected model
    indexes when adding items. In the case of the tree view, a selected row
    meant selected model indexes for all it's columns, so whatever was
    selected was added multiple times.
    
    Close #6408
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4cc9d5770a108434038e7f5a4e1bf9b3aafa3d8e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e8b8012d8690d7764f59d804648160c101bae2cb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Apr 11 22:41:58 2012 +0200

    macosx: prevent intermittent crashes on quit by releasing the main window later, since libvlc can try to access it as long as it is alive
    (cherry picked from commit 2ad2a0bd8d9caee51a66e8b0fcd4669f942cbfa0)

commit 2baabf9dbe4217b61f6194ec3aaac411187cb635
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Apr 11 21:48:30 2012 +0200

    macosx: added media key support for keyboards by other manufactorers than Apple such as Cherry
    (cherry picked from commit d082caf8f4f680bcfbcef9b6e86fafc1b16bca13)

commit 067cd23ccea9e472b206442404829378219979e2
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 10 16:43:16 2012 +0200

    subtitles: Do as stated in the doc.
    
    ("0 = no subtitles autodetected\n")
    (cherry picked from commit 8748391fd5f6d31fad420eb7e23d004a55698774)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 84cb4eb92ea6d08901961d365aee8fef44062cfa
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 10 16:24:59 2012 +0200

    subtitles: Remove unneeded clause
    (cherry picked from commit c517279280c28114ef0ceb1bf5e8a99cf6ce436f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0b5bfb38ab3c03b2c2ce1063c0cffcb0d1fb9b10
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 10 16:24:02 2012 +0200

    subtitles: Fix "any subtitle" detection.
    (cherry picked from commit 2ae88e927cc5df1c07385412b72d60f86fc2f073)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9777ead16c80cee7a42f3efbf6ab45e6b6af33b7
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 10 15:39:09 2012 +0200

    subtitles: Remove unneeded clauses.
    (cherry picked from commit f97effab97f11c8b187e4734b452fd88a92fa713)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2eaee5286a71d0dc6a618f54aa0a6bf69ad64d36
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Tue Apr 10 18:02:29 2012 +0200

    skins2: fix forgotten initialization in copy constructor
    
    This bug was unnoticed because this constructor is only called in a situation
    where really copying from origin or leaving it to the compiler to set it via
    the default constructor leads to the same result (an empty list). Yet, this
    was a bug.
    
    It may solve trac #6599 though,
    (a Linux port where there is a real initialization issue)
    (cherry picked from commit 076851b74bee39d0c911a344063f5e4731dda28a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 824abeccb5ae5e8201d9c6aa80b644296f399892
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Apr 11 18:39:44 2012 +0200

    Qt: do not block the spinbox if preference range is too big
    
    However, we still cannot select the full scale.
    
    Close #6603 and #6602
    (cherry picked from commit 5deeed2ecd91ca2634fa2e657a8a887e274c226d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 53070d79f8004c02c971f73b5557e3aec42c19c7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Apr 10 18:15:51 2012 +0200

    macosx: make sure that the main window's split view is correctly resized on relaunch (close #6597)
    (cherry picked from commit e908f36fd20d67465af399507ad0a898e86c678b)

commit 3f87c4d309f9b9fe7d1fc3bc452e6a903fc76853
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Apr 10 17:22:14 2012 +0200

    macosx: re-implement drag & drop support for VLCVoutView (close #6604)
    
    additionally, clean up misc.m and move code shared by VLCVoutView, VLBrushedMetalImageView and VLCThreePartDropView to VLCCoreInteraction
    (cherry picked from commit c55ac4febf308e50ccc72ff96becf1aeb76faac5)

commit b7f6772ecd882719de32053f8c0d38a351e90b61
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Apr 10 15:26:39 2012 +0200

    subtitles: Fix subtitles detection.
    (cherry picked from commit 5395e9b85e5823b41cf7353b327445c6ff426edf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 106bf7aaa02727d61b31155bdbb1bb630de4dd5f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 15:30:19 2012 +0200

    Support VC-1 in mp4, as muxed by L-Smash
    
    We received already complaints/samples by 4 people in the last week-end...
    (cherry picked from commit b4dc61ce93b6706c67139dad1259f1a3b788f18c)
    (cherry picked from commit ba1316be2521e153593ca75e588b78d5077caec3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 280369df6a39f725d5a40c1e45aad7b572b27d70
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Apr 10 11:47:19 2012 +0200

    Qt: correctly destroy EPG dialog
    (cherry picked from commit 3273505a50f62e15dab7b6c328e940d456f2a07e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ee2cd658a3bf1c8b2efcecbd3cd5aad978f4ea2c
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Apr 9 22:59:54 2012 +0300

    dvdread: fix use after free on error (refs #6594)
    
    (cherry picked from commit 9ad094db2b47d5b57f5f8ac53c4a2848b3bffac7)

commit fccd8c3248ca2137af233c201029538f0af1ebed
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Apr 9 22:58:57 2012 +0300

    v4l2: device parameter is a file path
    
    (cherry picked from commit 4c09ad19963e3940e2ef3be43843d4902afebcd7)

commit 4459562ea387c2d66de4e6ed68d5895b1af416ad
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 9 20:34:07 2012 +0200

    macosx: make sure that all sidebar items are visible on the very first launch
    (cherry picked from commit 337aaf7c1ff706467c2c8e3abafff58263277b5b)

commit 13ba34806115e956e3243cf42af45b01b3172593
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 9 20:33:49 2012 +0200

    macosx: update old preferences detection code
    (cherry picked from commit e16774656a1e7abc526d1ac0d37755fd38a3e496)

commit 01366d825e6e716cd324e61faf4abe338bda0f9b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 9 20:24:47 2012 +0200

    macosx: don't show focus ring for the sidebar
    (cherry picked from commit 470ccf4d276b59879a59663082f13e4c0dd78708)

commit 1bf284b014211dff18ea765cc37a8c1631847ad7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 9 18:56:00 2012 +0200

    macosx: save the expanded/collapsed state of the sidebar items (close #6389)
    (cherry picked from commit 815b2ce8389f038c12552b26df59fea67a96ad43)

commit 152a99ea2c69683a48fcd838fce26455c1994e92
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 9 17:23:15 2012 +0200

    macosx: added 'subsdelay' to the track synchro panel and removed the bogus, non HIG-compliant plus and minux buttons
    (cherry picked from commit 3e73ad2a8ab6d5e50ea80025d364edbe7ead1d1b)

commit 712fba57f9a51d4a94932fc68cc56f863c00f43b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 9 16:34:00 2012 +0200

    macosx: sync track-synchro l10n strings with the qt4 intf
    (cherry picked from commit 03ad78e9e4799fe3ff713b9b37ec521f7ffb61fd)

commit 230b2823d0182d4c3042e0a8a5786f3047f868b4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 8 21:20:47 2012 +0200

    macosx: implemented drag & drop from playlist to media library and vice verca. additionally, drag from SD to ML or PL is supported. (close #6044)
    (cherry picked from commit 09aae32b04734a520c0087fe12af8deab518bd7d)

commit 3be150d7fc0ced6632279a822140fa661e6d6b27
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 8 19:04:04 2012 +0200

    macosx: removed VLCControllerView, which was superseeded by VLBrushedMetalImageView and VLCThreePartDropView
    (cherry picked from commit 84e84d3fab2140eb7ed4e1bfef2c47adf8ebb9ef)

commit 9edc234ff0dec4ce1ae0c8d6fbff528f06b5bfa7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 8 18:50:33 2012 +0200

    macosx: refuse file drops on the playlist table if the current root item is neither the local playlist nor the media library
    (cherry picked from commit 7bb775484f81f6f848662103355089c191a960d1)

commit 0674820a4da075bd8d9a2600e00ad76f0918be2d
Author: Frode Tennebø <frode@tennebo.com>
Date:   Sat Apr 7 14:53:21 2012 +0200

    Fix problem with black and/or random colours for paletted codecs, like MSRLE.
    
    Should close #5952
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7f99f183c055dbb657a896adb568687b6264df44)

commit 61ed10ecbaa0387747daed302aefcdf407b2e3eb
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Sun Apr 8 09:19:05 2012 +0200

    asf: fix typo in fourcc
    (cherry picked from commit 9e30334303bdc0ead62915121d9712d9b7c0e6d8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 53d47cab1315f664601f081ab3c641e86cf5e241
Author: Denis Charmet <typx@dinauz.org>
Date:   Sun Apr 8 02:14:03 2012 +0200

    MKV: Don't crash when loading a directory with no uid MKV files
    
    Close #6575
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4599e6a4491fce5a8ae3377e601ab3aa258d33e4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b56a6d0f8b95ac5633c5ce99443be02bb67a7e98
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 8 16:29:06 2012 +0200

    macosx: fixed drag & drop handling of optical media by re-writing it
    (cherry picked from commit c789f858d4a31d65be4af4866573e81ae0bc543d)
    
    Conflicts:
    
    	modules/gui/macosx/open.m

commit 9c3dd03b3461311f9d88b6d440a15eaaa68638a5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 8 15:05:30 2012 +0200

    vout_macosx: re-write VOUT_DISPLAY_CHANGE_FULLSCREEN the way it was intended and update the display size correctly, so we get sharp OSD rendering
    (cherry picked from commit 4a10b45f3147f524ce09bff7b939d09a3f59f108)

commit ba72805f634ec841a47da58e32f042ff48705bd0
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 8 02:59:43 2012 +0200

    macosx: fixed appearance issue when collapsing / expanding the playlist while it is empty (close #6382)
    (cherry picked from commit a80d58fe1365522844c3d504d9bb9f3740fe8316)

commit add5e63dce6a84827b5fecfa2cd3de20994513f7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Apr 7 23:44:30 2012 +0200

    macosx: set a sane minimum size for the advanced prefs window, so the options remain useable (close #5994)
    (cherry picked from commit 219dd45d31f36be3f93c9331c2ffac4114b42566)

commit 1a85d8efb891a5e4502b0ec6979d697f51ae6376
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 16:40:22 2012 +0200

    macosx: added 'deinterlace' and 'deinterlace-mode' to the video category of the simple preferences
    (cherry picked from commit 298ca276a1149034447bd32d9230450a904d33d2)

commit 5a570c7eecef1f588a5ccb59258b8799eaeb808a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 16:22:37 2012 +0200

    macosx: added options to modify the subtitle outline to the simple preferences
    (cherry picked from commit 127ae211fb7c9d21d4d6f3f73fde76e05e98b6f1)

commit 68e4726dbf4ed2a60804b361d1c4e364bd220a5b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 15:35:44 2012 +0200

    macosx: added an option for the AR lock to prevent angry users
    (cherry picked from commit 8687ceac8e0c7fda373188ff5e29e704993370a2)

commit 90a912af79b901d0d373652968987518504b951c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 13:08:42 2012 +0200

    Update NEWS

commit c17e2e7f0e530c4acde584391d8e86b8f17d628a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 13:29:13 2012 +0200

    Qt: fix semantics and behaviour for chapters buttons
    
    No sense to display chapter buttons with 1title&1chapter
    (cherry picked from commit 2059bea41c0ea723466ccbb3e9d9550b26e2e2ee)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 16fceef96325da5480d573680f9a2a73b92b3cda
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 12:49:37 2012 +0200

    MKV: show title when in Information section
    
    Close #6337
    (cherry picked from commit 28a17b3a42ca3790d6701d230c8f586214bb8759)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1cf047576dfd40784ea86f69fe6f3a63e54c156f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 12:19:42 2012 +0200

    Deactivate HTTP proxy inheritance from IE
    
    The parsing is not complete enough to be on by default.
    http-use-IE-proxy option was removed in ac40aef7f6252
    
    Should close/delay #5782
    (cherry picked from commit 457fda26b42a7a6cbc9d6149cc53e92979ace83d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e5cca173ce000b75da3f7e3de6fb6f282799f3d7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 15:08:51 2012 +0200

    macosx: re-implement 'keep aspect ratio' (close #6430)
    (cherry picked from commit f325462b082c9cecda54b4d9dc68f43e046cefcf)

commit b3127daf8deafa19bb69daceebf591eb67d4adeb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 13:32:39 2012 +0200

    macosx: work-around a racing condition (close #6412)
    (cherry picked from commit 6cbf48f1f9c38c1a0ed91fb6699f977b3b7f97ea)

commit 610e71f1e5b6e919782a6de6ff57defa561213d1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 13:18:41 2012 +0200

    macosx: prevent a crash by stopping the current input when changing the 'video embedded' variable (close #6063)
    (cherry picked from commit de93266466b9d96b9fa3df9c66db1df93f3cebf4)

commit 8f9542684d5f55676da352fd705c55786d83ea95
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Apr 6 13:09:12 2012 +0200

    vout_macosx: slightly improve the resize behavior in a few corner cases (refs #6427)
    (cherry picked from commit 25cf83bcace12d19b4980140037096a0b57bcd87)

commit 5b94b7d510a323dcad62205831d0c7ca9e186849
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 02:49:44 2012 +0200

    Twolame: bump priority and accept mp2a fourcc
    
    This restores compatibility with 1.1 command lines and docs
    
    Close #6227
    (cherry picked from commit e466c8278d9cd13d055df9375e30a0ab805cc2c3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e45858ce2292b640858fe45d87ac436e92a17edc
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Apr 6 00:15:27 2012 +0200

    Correctly detect alac in mp4 properties
    
    Should close #6570
    (cherry picked from commit 7f807d9bb7cb08f1401d5cbec472338ed1d38157)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4949deed1d64c2abf914d06e8a8731bd5f58c085
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Apr 5 23:24:58 2012 +0200

    Fix vorbis in mp4 sample
    (cherry picked from commit b1b423c17b7d133242a02a185823e91dbe554540)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d6b589b131c993b96bdb17bd5d41cb36637a76e9
Author: Frédéric Yhuel <fyhuel@viotech.net>
Date:   Wed Apr 4 14:11:58 2012 +0200

    network/io.c: minor fix
    
    Unlike POLLERR, POLLHUP, and POLLNVAL, POLLRDHUP is not set by default.
    See http://man7.org/linux/man-pages/man2/poll.2.html
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit c0e768b8fd8e6405a3864db3b2358c1ccd89a476)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7563c8713a7fcb45c1d73321f1af2d53060f51b9
Author: Piotr Fusik <piotr@fusik.info>
Date:   Mon Mar 26 23:35:38 2012 +0200

    gme: fixed out-of-memory/out-of-range tests
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 44b34340a6d2d3b94f4260ad80e080b94fd18b3b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 011d14cf88f486382ce486e1933dc028bbb13b2c
Author: Frédéric Yhuel <fyhuel@viotech.net>
Date:   Mon Apr 2 21:11:37 2012 +0200

    HLS: don't use floats when not necessary
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 0ef7876bbdfb9166a414fb057851aac535119122)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6444ba4422320bae142661bd3a16ed1298523ca1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Apr 5 21:39:12 2012 +0200

    Vorbis: do not display meaningless data in meta
    
    It can even crash Qt interface
    (cherry picked from commit 71a82406e23055bddbe1f9a2f3f31efd1df63938)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 22988fc85d17b477b1e460f7c4bfbfcdd7b8a9ae
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Apr 5 10:38:23 2012 +0200

    Contrib: update libpng to 1.5.10
    
    CVE-2011-3048 (serious vulnerability)
    (cherry picked from commit efeb2e712313a988743307bea766edac2d748d78)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a924e76361a4120bbdf8d156a825d4f79e2cad99
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Apr 5 11:59:11 2012 +0200

    Update AUTHORS for 2.0.x

commit a98c82cd4cade1c45e15e305c763175653e10a44
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Apr 5 11:53:03 2012 +0200

    NEWS

commit c7c5709b6d4941157356d366169a5163e9c21349
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Apr 4 00:18:54 2012 +0200

    Make DirectX default on XP, instead of Direct3d
    
    This is not manageable.
    After the black screens, as reproduced by Rémi, (fixed I hope)
    After the grey stripes, (fixed too, I think with DevCaps2)
    There is still:
     - the yellow middle stripe, with failing IDirect3DDevice9::StretchRect
     - the subtitle blending issue, with absolutly no messages #6542
    
    We have enough to do with the delayed pictures not displayed, in case of
    subtitles and the broken audio in so many situations (not to mention the
    volume delay...)

commit 8f49ba021a0a9c07b9e187c19f2fa29a88c5b94c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Apr 3 18:36:55 2012 +0200

    macosx: add implementation for "macosx-opaqueness"
    (cherry picked from commit a4a14d8bce9ef70ca4a85a6cdcb5d41643db0b6e)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 080540aea5cb17d66b811aaff73960186436eeda
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Apr 3 01:42:38 2012 +0200

    Improve the auto-load default preference
    
    A lot of releases have subtitles in subs/ subfolder
    (cherry picked from commit 2f35b8708c96bc1078ccf3aa3fd64d49f82e3952)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a742ca136a9e998fc8786ef37c636968f3f37522
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Apr 3 01:37:04 2012 +0200

    Fix other subtitle pathes autodetection
    (cherry picked from commit 9f0c79759d108db628c0095fc0a42ade0e6d076a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7ddc194cb376484b3c044fb9e80e8ccf82172e1c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Apr 3 00:57:45 2012 +0200

    Qt: fix opening of the last folder in open disc dialog
    (cherry picked from commit 04a79492408acd2f7c911d84ca5fd6ba851b0e87)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7a6bff50e992057ee2ec2ff5d10c4eb7ee1c7fa7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Apr 3 00:53:19 2012 +0200

    Qt: fix small error
    
    This was not correctly saving the last opened folder with some encoding
    (cherry picked from commit 0fe06bc3f1cae8823f3a7baa012b1ff4e126a286)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d862c1b90ff84caa018918c0fb1fa802a3e5bba4
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Mon Apr 2 17:19:14 2012 +0200

    SMF: avoid a DOS if the SMF header is invalid
    
    Reported by Marcin 'Icewall' Noga from Hispasec
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e6003756a15b832cd63a8d007b1142f838aaea75)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ddf556c01521ea7b65afd6dc3a3e234e62566ffe
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Apr 3 00:00:43 2012 +0200

    Contribs: update FFmpeg/Libav sha1
    
    Close #6415

commit 21f68b9921e84235a8f80f9dc3ac81c520376a6b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 2 05:32:33 2012 +0200

    AU: fix division by 0 with corrupted files
    
    Reported by Marcin 'Icewall' Noga from Hispasec
    (cherry picked from commit bb222c8a9b0a4b89cfd6aa1ad230fe8bfdaa6c7b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e0bfcce8d2114fdb863408b4971a2adca2c4447b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Apr 2 05:16:00 2012 +0200

    VOC: avoid division by 0 if number of channel is 0
    
    Reported by Marcin 'Icewall' Noga from Hispasec
    (cherry picked from commit 83db4181230ae3a0dbb3e7b64313988fd8cc31e5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e9da42a1997f5dc2cc8c85ff0141bf410b5d346e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Apr 2 17:43:03 2012 +0300

    fr: more consistent caching translations

commit 6f99ce5a15f0f391106f81be0a1baecd7ca5f9d3
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 2 10:17:28 2012 +0200

    update OS X NEWS

commit d90a4e3a04489c442c7474a860b7c73e6349a335
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 2 10:10:31 2012 +0200

    macosx: retain the macosx-audio-device across multiple sessions (close #6551)
    (cherry picked from commit 4356367929b95f61fae9e98b0d94743ec807701c)

commit e777665112af2dad7b73c08abe77b7049185d95a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 2 09:36:18 2012 +0200

    macosx: preserve settings done through the menus across vouts via the playlist object (close #6550)
    (cherry picked from commit 1b00b4a7cdfe9fa9bc576f0df396a432e7f840c1)

commit 6dbaf8bc7d3d3c35695140090c980393d23216df
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Apr 2 09:19:34 2012 +0200

    macosx: make sure that the 'updating font cache' dialog doesn't show empty content (close #6439)
    (cherry picked from commit e1b1237c58718193bd74a198294be8d2de3b8625)

commit 296c59ab67aa9c56f32b0c6f2f081c3dd01f3b9f
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Mar 22 09:56:45 2012 -0400

    luahttp: bump API and document /art changes
    (cherry picked from commit 488f94b14be6564b96eba3a59ad0d404fd287f8d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 331c7c2cf8c36dac9474df8f9d94e62484c79975
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Mar 21 20:41:40 2012 -0400

    httplua: export art by playlist item id
    
    Usage: http://localhost:8080/art?item=1234
    (cherry picked from commit 47a9b9905ad74daa283af81e2a21715df2900b4e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 72a9f481755ec2b355f9591bcb1929331cfc1cbe
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Apr 1 20:15:15 2012 +0200

    Qt: remove DMO selection from Simple Prefs
    
    Ref #5814
    (cherry picked from commit 9effd9e76da80fce6f8c6053129a63d648cb5698)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cd275b2ee7fb9f647b40a64d03ed336bdf67970f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 1 20:19:44 2012 +0200

    macosx: use optimized drawing for the main window as well (in addition to the detached vout window)
    (cherry picked from commit ca0752e4ff27c29b63f95f579378a4c1fa983488)

commit c57451c2c16a965dbf56bc50372591490932fc8d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 1 20:14:12 2012 +0200

    macosx: make sure that VLC always shows a visibible video window when spawning a new vout (close #6418)
    (cherry picked from commit 8b06a658de60f18809b4282baa6f216333456495)

commit a1bf9b27d7ef61b345b0f49a58689d845684c49b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 1 20:06:00 2012 +0200

    macosx: make sure that the subtitles menu item is correctly updated on playlist item change (close #6342)
    (cherry picked from commit 4ea48984d94a295d41285f4bd2704a4b0f63a541)

commit 0c17610b85869e9d10b081cd082ff348e78eeb08
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Apr 1 20:00:49 2012 +0200

    Web: support correctly all cases of extensions
    
    Ref #6544
    (cherry picked from commit 69030f1153a62f67a21e0d0834691a4e973e8a63)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dc22d971eec913b5a28cd819b6988e64dc8a45c2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 1 19:19:17 2012 +0200

    macosx: updated gui for new spatializer values (close #6516)
    (cherry picked from commit 6b7628d8e4512631ff1cf3a6d00e147ac2ecbfba)

commit abc06f0fbf1023cbda1fc3c1e0abcce885e2a401
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 1 16:25:47 2012 +0200

    macosx: resize time field in the detached video window to make enough room for runtimes longer than 1 hour (close #6445)
    (cherry picked from commit 4a75f8a8a27393ee16faf285fd68d9c17475b59c)
    
    Conflicts:
    
    	extras/package/macosx/Resources/English.lproj/MainMenu.xib

commit fc12b383df73661cab33c993af0c114f13c96576
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Apr 1 16:25:08 2012 +0200

    macosx: fixed inconsistant fullscreen button state in the detached video window
    (cherry picked from commit a8fad6766cbc27471f494a5e176112f40516054a)

commit c063b82100df5f3b2a65311529eafa2ee3f41262
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Apr 1 12:03:22 2012 +0300

    Qt4: fix disc dialog on Linux (again)
    
    5a2390a78863423a6b5108debd1c6939ac5ab38a is the first bad commit
    commit 5a2390a78863423a6b5108debd1c6939ac5ab38a
    Author: Jean-Baptiste Kempf <jb@videolan.org>
    Date:   Sat Mar 31 22:20:58 2012 +0200
    (cherry picked from commit 0041fd5c1d6dec6ff43a5e1ecabfcb028e2f10f3)

commit e7ffa08fb6cf5c06c036beceaf9da23ae23a9dae
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Apr 1 00:42:03 2012 +0200

    Update NEWS for 2.0.2

commit 008c3144f4afb742d2d913f14b7bd270d2af5f6e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Apr 1 00:31:06 2012 +0200

    Qt: fix Windows open dialog issue on paste
    
    Close #6242
    (cherry picked from commit 527d35074fbd64768eab60b23797aac9fc589019)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9cba28d804dec6a1eea7523392877cab6e6ef0ff
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Mar 31 22:53:17 2012 +0200

    Web Interface: correctly select extensions
    
    Close #6544
    (cherry picked from commit 0585f02300f36b5149efff555b3ea65d7fd3ed49)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d87f79fab65ce6b994309a729766e3da80131d98
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Mar 31 22:35:39 2012 +0200

    Qt: fix SD search
    
    Close #6368
    (cherry picked from commit f33816a822905117534229be1d41b1b2bd98a59e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit aa1ea08257e16ef347a0aecbac0e953f98df084f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Mar 31 22:20:58 2012 +0200

    Qt: fix drive selection on Windows
    
    And close #6536
    (cherry picked from commit 5a2390a78863423a6b5108debd1c6939ac5ab38a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d4d31694c77fe5073d782185b4bda305936aa777
Author: Colin Delacroix <colin@zoy.org>
Date:   Thu Mar 29 15:19:09 2012 +0200

    macosx: fixed a thread-safety issue in the open panel code
    
    VLC crashed when mounting multiple volumes at once
    (cherry picked from commit 35e8ad40158caf05b597d258609cb2c0570eaf0d)
    
    Conflicts:
    
    	modules/gui/macosx/open.m
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 24e4eca0599e4d4d702060e069f3d70cefac9d95
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 13:04:40 2012 +0200

    Contribs: update openjpeg to 1.5.0
    
    It is supposed to be a bit less slow
    (cherry picked from commit 6dbd403bac9fa159b71cf66768dd61278ce5a370)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 377c1b104067b85715dd07814f778dc1975e5455
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Jan 27 11:21:46 2012 -0500

    contrib: openjpeg: freebsd has posix_memalign
    (cherry picked from commit 4105ebb57dda9350ef0dcb23089146c9af79857c)
    (cherry picked from commit a6d52f6fa7a1f62d29fac153f486156134d9ff86)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2d2858146c968dd28ec9fdb60604714c5c4337eb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 30 17:03:58 2012 +0200

    Qt: correctly release vout objects
    
    Close #6118
    (cherry picked from commit d1fdb577189ecc763f81a691ed28e601ff2438e2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8b76aa13fbdda2827aa8c8682112fe62a43e2610
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 30 15:53:02 2012 +0200

    Qt: tweak open dialog for translation
    
    Close #6447
    (cherry picked from commit 7641dadb21bf0e60ea99c092caa1dcf3fca257c6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 223f96c793fc4c05e5b9c638d77a4e2a3ec78698
Author: Aurelien Nephtali <aurelien.nephtali@gmail.com>
Date:   Thu Mar 29 16:13:45 2012 +0000

    Fix --sout-ffmpeg-codec
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 01985075405e84ba650bbed85721c95f2042d04a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c7fbe3a593ba7a695e01036e621f4a9319722732
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Mar 29 17:58:32 2012 +0300

    Remove bogus VLC_UNUSED
    
    Please don't hide bugs.
    (cherry picked from commit 8cecb7ac15fa6313d27b2a7a1cf27287299014bb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ce8b75cfaf7208c0a4d4561027486959345afd64
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 19:08:55 2012 +0200

    Contribs: update GSM to 1.0.13
    (cherry picked from commit ce30867edd6c01386cce663b8a346bd84c69bbc8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b60ad706c7f4d571c0e80ac2b3efd33d5c35d426
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 19:01:30 2012 +0200

    Contribs: update UPNP to 1.6.16
    
    Important code changes were done by Orange
    (cherry picked from commit be96451c7799f1b2831e5d05dea4e5d0bf94643b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 81823ae8fbfda80fe65faa70d0703626657f472c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 14:29:49 2012 +0200

    Direct3D: add more debug when CreateTexture fail
    (cherry picked from commit 2525785d059209ceebe296228af4a76d9d20f81d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ac9ed3e1939068eb70a65c4c6b17debb46086c80
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 13:52:51 2012 +0200

    DVDnav: some .iso files are wrongly named bin or nrg
    (cherry picked from commit 03776f4685e99c562c840a2e8ddfcc8ee9609c8c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 60ad583a924c03028407daa5478a726217c36a1c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 27 22:20:52 2012 +0200

    MP4: support for more codecs in mp4
    
    According to http://www.mp4ra.org/object.html (not tested)
    (cherry picked from commit 3d96a1aba6b31f1b0a70805989105073d24f5f43)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 252b6fdf8b3904dbc2db28c5ea17ea0d04642954
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 27 22:10:27 2012 +0200

    MP4: support DTS in ObjectTypeIndication
    (cherry picked from commit f6dd8d2f62f14ce6fd03e7f642113efba1ab060d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit df93af210c92f7eb9749b07d389fd15865f7eef0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 30 13:37:33 2012 +0200

    Direct3D: reject old drivers with insufficient capabilities.
    
    Close #6501 and #6469
    
    This is not exactly a backport from trunk, since this is less
    aggressive.

commit 280a6f9f63568a76f5386bf46defae9bd519b7d8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 00:51:43 2012 +0200

    DirectSound: fix device selection
    
    Close #6504 #6510 and #6511
    (cherry picked from commit 58a99f2a7c820d86c39a126ccd9db104156966d6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 87017ad340c11e9f4883b30b2d2c586d3a820cf7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 28 00:34:59 2012 +0200

    Spatializer: init variables correctly
    
    Close #6514
    (cherry picked from commit 600d2090fb165045c6fb2fc42b16f64a3a400896)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 19d0a948e13d2e97fecac2cef740bf2d039d1ada
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 27 20:47:30 2012 +0200

    Qt: adapt the UI for correct spatializer values
    
    Ref #4887
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d787a15aeef5a79e18fdfd8e16118b7c2df37fbf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3f92db24138eb52f84a218171f01e74bb7129dbb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 27 20:13:19 2012 +0200

    Spatializer: more sane default for Wet value and limit all values
    
    I am not sure this filter ever worked as intended.
    It was providing serious distortions.
    
    This is now limiting seriously the space of parameters but at least it
    does not explode anymore. Should close #4887
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit be8542ade356de4fa218b03df22747182bcbe9a0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 05fc7551ee9d314b04b3f717cc76a5757f9710ae
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Mar 25 14:09:23 2012 -0400

    luahttp: Improve code and fix sloppy error
    
    Close #6489
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 885391aa4ee3ab8a32a2a7f6e56e8380a162774e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 28cb395de530759b5b5ee2dc39dbfe9be1d6844f
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Mar 26 19:00:44 2012 -0400

    win64: build and ship activex plugin
    (cherry picked from commit fbbc06244c23e5af97409390115c5a42d1dbfb5d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2e90c9490b52d1247eb45e5a822aabda9829a2c4
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 8 13:08:08 2012 +0100

    Support WMA Lossless with recent enough libavcodec
    (cherry picked from commit bc368cb418feb3c5ce8a1afd1699cad3fbf00acf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 714534bb11ed27e7848edc455fe43055d6597cf3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 27 21:32:45 2012 +0200

    Support more DTS FourCC
    
    Fix decoding of some DTS in mp4
    (cherry picked from commit dc954ca43c9aebeea028144e251bc3db9f53423a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b69404ae3352313dc183e2418fe094db2a6b1824
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 27 22:27:47 2012 +0300

    channels.conf: update/fix parameters values
    
    (cherry picked from commit aa392c1ef5d2984ed92f4413954087f42c14549a)

commit 62c620a6bd2430d7c6ec194f68a8e9f43d3448ed
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 27 22:21:40 2012 +0300

    Revert "dvb: demux: generate uri" - fix #6497
    
    This reverts commit 3cb4988a9aa6b984ed83ec06fef4ad0546c2d166.
    
    Conflicts:
    
    	modules/demux/playlist/dvb.c
    (cherry picked from commit 805ddb47cb0032f471f23232ec01e93d0fb8c8e0)

commit 525b63fc229583a0a934496f5e47056e0158e03b
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 27 20:28:01 2012 +0300

    Fluidsynth: .8 gain is too high for many files, reduce to .5
    
    (cherry picked from commit 76c940130f875ff89838fdc654ce1a8029c17ce6)
    
    Conflicts:
    
    	modules/codec/fluidsynth.c

commit a0ec0a367cebf5569ca70dad322ead58c4c7ed9d
Author: Colin Delacroix <colin@zoy.org>
Date:   Tue Mar 27 12:31:32 2012 +0200

    Fix a crash on Mac OS X when mounting volumes

commit 578e883db453c4c4449997e31ffbaf19a87c70da
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 27 11:36:43 2012 +0200

    NEWS for 2.0.2

commit e5569fbebc9ee942396458019123dd4af48689db
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 25 23:22:32 2012 +0200

    vout_macosx: don't fail if quartz extreme isn't available, but show a big warning
    (cherry picked from commit 3bcac4a47cecf8506de253a53a64eb61e033b0cc)

commit 90237c303c4c6f4a2f80f57e330da72d661b7d9a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 25 23:14:38 2012 +0200

    vout_macosx: check whether the receiving window can respond to non-standard calls prior to calling them (close #6034)
    (cherry picked from commit fe53c6cd32682d52f740bc49767c5eab68632e51)

commit 32304937c07e54cf8ba9e7700ee21774e67567dc
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 25 22:57:39 2012 +0200

    macosx intf/vout: respond correctly to VOUT_DISPLAY_CHANGE_FULLSCREEN (close #6464)
    (cherry picked from commit 7515422f601011a2295b928fdf39f8af7376de2b)

commit 2229bec7683d2753349c748fbfdd9c6591416993
Author: John Freed <okvlc@johnfreed.com>
Date:   Sun Mar 18 16:23:18 2012 +0100

    dtv: rewrite of bdagraph to be tuner-based
    
    Loosely cherry-picked from f036b8a5d97db53d5c7e47736ab3d43aeb7520e8
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3305c6a100357989734a51ec3039cbce8f3287d1
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Mar 25 01:17:03 2012 -0400

    Qt4: Account for rare case when video loads too quickly
    
    Close #6481
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9340c4daa66dc15d40eec98535977338e150c5b1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f3ee60c1d4f30e36444261983911c1260deb8707
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Mar 26 17:28:58 2012 +0300

    url: add one test case
    (cherry picked from commit 1b01c5be4a68a8f6965a747fd3b6d79dcf4a32fb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3d7ba1660d8c4aa3dbc3a6450e0c66487c865a07
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 26 14:17:29 2012 +0200

    MKV configure: remove outdated workaround for MacOS
    (cherry picked from commit fe02503332a696c4634c7fc5caa012b6b4483bf8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b0b365ce55b2809cfaaa8deb6ed205e54f8db846
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Sun Mar 25 00:32:59 2012 +0100

    skins2(win): fix focus loss when tooltip is displayed
    
    Till now, when a tooltip showed up, the underlying main window lost
    keyboard focus (keys + mouse wheel). Users had to click again on the window
    to regain this focus.
    
    this patch mainly uses a flag that enables to display a window without
    activating it (see msdn doc) plus a bit of cosmetics.
    
    this patch should be backported.
    (cherry picked from commit e604141e18e6478581ae253a5bd270cc04391d9c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f1f59b923f4ded6894739f303b30c8a7739b6f3c
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sat Mar 24 23:35:30 2012 +0100

    httprequests.lua: remove duplicate helper function
    (cherry picked from commit f77f269b7e0cf50d8ed3b6f5833ed52a3cef7a9d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 043959a67dfcf6cf5bb6b9f27746495de9fc9e9a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 23 17:04:31 2012 +0100

    Direct3D: reject too old drivers and let them fallback to DirectDraw
    
    They would not work with IDirect3DDevice9::StretchRect
    See:
    http://forum.videolan.org/viewtopic.php?f=14&t=99498
    http://forum.videolan.org/viewtopic.php?f=14&t=99235
    http://forum.videolan.org/viewtopic.php?f=14&t=98882
    http://forum.videolan.org/viewtopic.php?f=14&t=98514
    (cherry picked from commit 544af798a1ec033321a51125c2c71769cc7b7873)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6bc24f389a0a1a892eaaac52055ded2e538ec6b9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 23 16:46:23 2012 +0100

    D3D: debug device information
    
    This is necessary to track the issues we have on XP with some GPU.
    (cherry picked from commit ce6fb6666b1295cfe0f565e86dd7378682d26262)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 845092888cbe7653e9242778a90996c08cec7dcc
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 23 15:30:02 2012 +0100

    Add extensions to open dialogs
    (cherry picked from commit 75791cb5afce94f3c8b8ca0e02b7f656cfa8dbe7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8ccfa41dac63f4cd59218cba4e2224318ff9d61f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 23 14:01:39 2012 +0100

    Logo: fix logo-repeat param
    
    Should close #6397
    (cherry picked from commit a4e18517009d3aad9e0f956e68358766267de9c8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 87b30c3c704f0683c85c8e4af670f4b98d8c5a35
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Thu Mar 22 18:51:16 2012 +0100

    skins2: key handling (cosmetics)
    (cherry picked from commit 1a64a930b2974f80d7a43cba12f8bbf50718d1c0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3d2c0a2204371c3484e6802fd7769b1ca0a4fe16
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 22 18:55:29 2012 +0100

    Contribs: update Vorbis to 1.3.3
    (cherry picked from commit 5cbe1fe2e4103f1e1c387f86e3e620450b28e8f8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ba511907e90be341b5b297ba83061e39035bbe5d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Mar 26 17:45:35 2012 +0300

    Linux DVB: fix memset() size
    
    Pointed-out-by: Rémi Duraffort <ivoire@videolan.org>
    (cherry picked from commit a52bbd192f4c1f2b1e6e1fdeb8c42a0a3a95b6d9)

commit 4cde6f874bf69bd9bda43c95d6687b0f14f21b3e
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Thu Mar 22 20:48:01 2012 +0900

    Add disc drives probing for services discovery on OS/2
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 10f17cdeeaaca3c6a6df37ef010d8498bfc173e5)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 68b0a5ab6379ff6b430cf8e3c7cef21d6c7c3dfe
Author: KO Myung-Hun <komh@chollian.net>
Date:   Sun Mar 25 15:45:03 2012 +0900

    Implement vlc_rand_bytes() for OS/2
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit adee869ff5c6000fda61358460f30feaf1f63a8c
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 25 18:46:47 2012 +0300

    vlc_strcasestr(): fix infinite loop an invalid haystack
    
    Pointed-out-by: Edward Wang <edward.c.wang@compdigitec.com>
    (cherry picked from commit baada5eddfe86431037950fda5c27812ea9dacca)

commit e2cec4bc78252ddd9078339fa4557a36863d824a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 25 18:42:44 2012 +0300

    m3u8: validate UTF-8 input
    
    (cherry picked from commit 591633b76ae00810185c818fa4aaee7257291e9d)

commit c6cfea9901a8a1b6ddeeea6b5a20162681988536
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Mar 21 20:40:48 2012 -0400

    lua: export playlist item's input item
    (cherry picked from commit f79f3ae2f8d39656f52482694d6b4859d20a3c86)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 39356457012d8bbd382458ab6619629d8c2744d6
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Mar 25 05:04:40 2012 +0200

    lua http: use us_tostring() to fix locale issues with decimals
    
    The function is a bit ugly but it's difficult to do this using
    pure arithmetic.
    
    Fixes #6378
    (cherry picked from commit 1e9dc2967b7bb058d19231740bb64edaa8533ae8)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 456189991df0d93beb1ede88917796a1c0d8e1ca
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 24 19:48:06 2012 +0200

    v4l2: add H264 codec
    
    This will only be used if requested explicitly,
    that is to say '--v4l2-chroma=h264'.

commit ba42d3103fd4d1ddf2a8010b9bed5bc3312e236b
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 24 18:52:22 2012 +0200

    http: add missing Host field to proxied requests (fix #6388)
    
    (cherry picked from commit 28db77258e69b7931d24677d25a02c073c9f2a7f)

commit 875f8c7c29538dfcbdccdde72badd2d5d9da1d45
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Fri Mar 2 23:58:02 2012 +0900

    Mimic a behavior of GNU libiconv on OS/2
    
    DBCS countries assign their currency symbol to '\', ASCII 92. This causes
    an unexpected behavior when converting a directory separator on OS/2.
    In case of GNU libiconv, it does not treat '\', ASCII 92, as a currency
    symbol at all. So let's mimic GNU libiconv.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 8acdc1f532606e84d70c26066dc750a5a1867ac2)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit e8630fd474a89447465b61dfd837bea5036588f5
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Fri Mar 2 23:58:01 2012 +0900

    Treat UTF-16 as UCS-2 on OS/2
    
    OS/2 supports UCS-2 only instead of UTF-16.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 2cc70e681e8c5aab68679180f03eaf60cc8ded38)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 12b32faef9a0fa8360e2caf35fa607e8ef370eb5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Mar 24 13:41:53 2012 +0100

    macosx: fixed corner-case in which the play button state wasn't updated correctly (close #6204)
    (cherry picked from commit 5785e63a719e64fa00a5b98ba658444cd7653b75)

commit bc55de209cd412d41516e7229df14c8a8b2fda81
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 23 13:52:17 2012 +0100

    French translation mistakes
    
    Close #6403

commit db99f01eefb87c641553fd4fb764b22c3130b6b0
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Thu Mar 22 18:27:09 2012 +0100

    skins2(win): fix mouse wheel ineffective on Windows
    
    This patch adds isScrollable() to a control, so that we can distinguish
    controls that require mouse wheel (playtree, slider) from those that don't.
    In the latter case, we can then forward events to vlc core.
    
    this fixes #6457.
    (cherry picked from commit f3afffbc05eea48ef29191b169859b17e3f4b994)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 90efd88489b1a7773133c89d89ee379d62d98ae9
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Mar 22 20:15:10 2012 +0200

    PulseAudio: adjust overall latency, not (only) the buffer size
    
    Without this flag, PulseAudio will tweak the buffer parameters, but
    will not account for hardware latencies. As a consequence, the live
    caching parameter is not really followed - the latency is longer.
    
    Longer latency becomes a big problem when trying to synch with another
    live source (such as a V4L2 video capture device). Then audio is too
    late and gets discarded or messed up at output.
    (cherry picked from commit d8a96604534966dab34ae2251d370a10f319ecd0)

commit 7f6b1042ecf2293764e7a40295c116db81f85176
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Mar 21 12:54:25 2012 -0400

    switcher: convert to lavc 54 API
    
    based on patch by Richard Grenville <pyxlcy@gmail.com>
    (cherry picked from commit 66da497b2046f3835321bc9d83170285267e106a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ff3a412ef2cedf3c22ad98ed685ed5cbfa774d73
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Mar 21 12:52:35 2012 -0400

    switcher doesn't depend on postproc
    (cherry picked from commit cd470819736ad2d3153014b8c65b60a35e78a7fc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ec6a910f5ae00872ba4c7b8414e90d6cbf76306c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 22 12:06:10 2012 +0100

    Do not treat RMF files named .ram as playlists
    
    Close #6451
    (cherry picked from commit ef790e3727fbec13e8a7fd09122581e2ae92b6b5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 22db9f28b4c7a7fb1b0dde420854e5b1a0278b1e
Author: Natanael Copa <ncopa@alpinelinux.org>
Date:   Thu Mar 22 09:00:08 2012 +0000

    configure.ac: properly detect vasprintf
    
    According POSIX the va_list is defined in stdarg.h
    http://pubs.opengroup.org/onlinepubs/009695399/basedefs/stdarg.h.html
    
    On some systems (like uClibc) the detection of vasprintf will fail
    unless stdarg.h is included and build will later fail due to a vasprintf
    redeclaration.
    
    Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 2859c5db3a74c5155e1715614570e9cb38d0ef82)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0c32fe97c522a94f1c074819e79e489734308dbd
Author: John Freed <okvlc@johnfreed.com>
Date:   Sun Mar 18 22:29:28 2012 +0100

    DShow: Remove filters but don't Release() them
    
    Fixes undocumented/poorly documented Windows behavior. RemoveFilter function does a silent Release().
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 3f6ccc0d79eae7c684f6b406e4eefb458a50bb00)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e5fbc2d1db5ea5e66b1e27a990b71352abb80420
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 21 19:08:53 2012 +0200

    voc: fix skipping of unknown headers (fixes #6437)
    
    (cherry picked from commit ea068351d3991a1b330eb67fb13ddbb90943e659)

commit bdc6ec2a5b7011fa8b65748a85ac937f6b3541d5
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 21 18:04:21 2012 +0100

    macosx: remove volume osd slider code
    
    The slider is not displayed, anyway. But sometimes it flickers through
    for a short moment which does not look good.
    (cherry picked from commit 2fc5dc5fd4c2804d93b6993c9ac8765efd60412e)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 616bd2623e692447bf6eb4480f68ac8835ab8cca
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 21 17:51:34 2012 +0100

    macosx vout: shift the window above the lower screen bound when necessary
    (cherry picked from commit d612827ce2cd628732ef4937a15ec5a1f851995e)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 2ab590e6d6c4214be88643ab6388b565b054b1a9
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 21 17:16:39 2012 +0100

    macosx vout: remove unneeded center when resizing the window
    
    Note that the origin values can also be negative when we have our window
    on a secondary screen.
    (cherry picked from commit 1cee2e3b66d9c3e814385740f04f7569fe4c9ea5)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 018c77f710f3d9b60d09e355ea201f79b8527cc6
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 21 17:12:36 2012 +0100

    macos vout: implement VOUT_DISPLAY_CHANGE_DISPLAY_FILLED as it seems to be intended
    (cherry picked from commit e6820b6113e28172fe2ad590829ad7a7395cabaa)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 7d6fc8ee54a74d270dc676a1eb997f31d52fb6df
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 21 17:11:53 2012 +0100

    macosx: do not abuse "autoscale" to implement a fit to screen feature
    (cherry picked from commit 3646cf4340c3cb25b23fbb2e7376dc86424f04ae)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 972873695d48864c7ffa899c0385d36b2203ba4b
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 21 15:33:17 2012 +0100

    macosx: fix another rare crash on exit
    (cherry picked from commit bf916c3520997102ff862887065ec38f93efada2)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 24dcfefb56b71c79982d94dab013a61b1f5ce2fa
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 21 00:54:00 2012 +0100

    OpenGL: use more accurate YUV->RGB matrixes
    
    Coeffs have been recomputed.
    
    Close #6132
    (cherry picked from commit a712e052fbba82c04c3d5f193dfe625bb5b242be)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 69efa2dd08e4a1231faae30adaa2f74cab1133c2
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Sat Jan 14 14:17:50 2012 +0900

    Fix misleading Playback Speed string on menu.
    
    When increasing speed to 1.50 (command + =), '1.50x' is shown on OSD, but '10x' is shown on menu (Playback -> 'Playback Speed').
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 70a5e26593b671ab5d267b3c527fda4ba83deae1)

commit 1ec6b9e4312f5f87d124b99136b46496e765280b
Author: Denis Charmet <typx@dinauz.org>
Date:   Fri Mar 16 23:32:17 2012 +0100

    Fix next/prev uid segment linking in MKV
    
    This still doesn't work with ordered chapters though.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 50f3a9b9b79a27cd1d1d5e1fee583bf06edf9f85)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b1f63c28dd56c29d2db5df6f02f4b28ac4a39ff4
Author: F. Yhuel <fyhuel@viotech.net>
Date:   Sun Mar 18 18:22:12 2012 +0100

    libmp4: fix 'mfhd' parsing
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 0b1b7516b965fa87c295eb0e7b9aa249f917e4e7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b893be200e3673fc62da020b3b2d21a986e8c450
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Mar 19 18:45:20 2012 +0200

    mp4: fix NULL dereference (should fix LP#936488)
    (cherry picked from commit 38a4fd744aee8b52d5cd3f5424b64b6d37ded6c0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit da4c5c02db948c9b84aedc61107e4d607d6d2663
Author: Denis Charmet <typx@dinauz.org>
Date:   Mon Mar 19 22:39:15 2012 +0100

    MKV: Use the appropriate time value to avoid loops
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit fbdbd7dab2f509c6746e9077b060098b9d7a164a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8ff53dcc0ae507cdbc29e6349fc2c2f03b64abb2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 20 12:10:19 2012 +0100

    Fix OSD when auto-scaling
    
    Close #6423
    (cherry picked from commit 36641267bcfd98f26eaa0ae98ba7ac5d80d4184b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9384f8316080d970fba554238e645da28f9277c9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 20 12:18:16 2012 +0100

    Qt: fix directsound simple prefs
    
    Close #6424
    (cherry picked from commit f7f78e8a6d1019a03b86947552dbb26015c93f20)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 594e5cd3b76fff2b058e5762b628151583e27310
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 19 20:47:58 2012 +0100

    macosx: make sure that the http interface (and other clients) can toggle the fullscreen mode when using VLC's fullscreen implementation (close #6009)
    (cherry picked from commit 2a2bb7af2abb8d060d0cd8b79528655d76463c87)

commit 6b95aa05dda2a0912fe71908d7d0b3b462ad2cf8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 19 18:53:13 2012 +0100

    Update CVE numbers

commit c9ffe8461cfa7e7c94f235a4c393331269b720c9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 19 11:54:53 2012 +0100

    On the road to 2.0.2

commit 4f1cfa6dc742a365fe1f9f5e113def9446ea812e
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Mar 18 04:31:20 2012 +0100

    lua: do delete stdin/stdout client
    
    This fixes an endless loop when piping commands to stdin with echo
    for example

commit 22e2bb48dada6e34105e3a573197cc68ae72deb6
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Mar 18 04:19:16 2012 +0100

    lua: finish reading data from hung up client before deleting it
    
    In particular this happens when piping commands into stdin

commit 179cf124a9ca08ea3045bcf77fffd6dddc2c9f54
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Mar 17 17:59:36 2012 +0100

    macosx: native fullscreen mode is not default anymore
    (cherry picked from commit 9dfcc9e548abefb260a10df57f79151790a1bf03)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit bdbe309aa2189b8f72aaea501f06a7738ac444c0
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Mar 17 17:11:55 2012 +0100

    macosx: fix two warnings
    (cherry picked from commit 2368d54953fc4e7731d29ae8749c5ffb3ecb03b8)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 337eb191da7ebaa78e66bf229f53202e35b6039a
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Mar 17 16:42:04 2012 +0100

    macosx: remove custom orderOut: implementation
    
    The if condition was only true in a very very rare case, and even then the code is
    incorrect (e.g. when the detached window is in fullscreen and the user closes
    the main window).
    (cherry picked from commit 80e730f1e4d67f4a00428220ed170d477c85032a)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 3a3506ab18cd25c3f4b0927ecddbd75916114ca1
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Mar 17 16:23:39 2012 +0100

    macosx: set b_nativeFullscreenMode to true only if we really use this mode
    
    This simplifies the code in several lines.
    (cherry picked from commit de742db20a39f116ca2505926fe1a0e9c20de47a)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 233f70b51cc63010b19b2a40b9839e8e610612c9
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 17 11:28:44 2012 +0200

    GLX: glXSwapIntervalEXT() returns void so ignore return value
    
    glXSwapIntervalEXT() does not return a value, contrary to the
    SGI equivalent. In case of error, the X11 error handler is used.
    
    This patch fixes compilation with conforming headers. It should still
    be compatible with buggy Mesa headers where 'int' is returned.
    
    For reference, see the specification here:
    http://www.opengl.org/registry/specs/EXT/swap_control.txt
    http://www.opengl.org/registry/api/glxext.h
    (cherry picked from commit 9cf66c2856ab3a209fe15ec5662a8cd927ee20bc)

commit f432547b4da3b7eb5e647cebeacbf123f1053869
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 16 20:06:58 2012 +0100

    Update NEWS for 2.0.1

commit 52d890045745552b017eb8e7cbc3cbd69a8cfaf9
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Fri Mar 16 18:37:44 2012 +0000

    l10n: Refresh POs for 2.0.1

commit d1bf541102e3cc474a6d18b650e6292185490db0
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Fri Mar 16 18:37:06 2012 +0000

    i18n: Update catalog for vlc 2.0.1

commit 834a66dffcd7ba90fc44b4918017df4ac7b2d77d
Author: Gaëtan Rousseaux <garousseau@voo.be>
Date:   Fri Mar 16 18:20:37 2012 +0000

    l10n: Walloon update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 6ee14fc1d5fcf891ef6e7b4b1f9fc1a9bd096546
Author: Kaya Zeren <kaya.zeren@zeron.net>
Date:   Fri Mar 16 18:19:09 2012 +0000

    l10n: Turkish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 62f898f903ecedef7ac3bcf24c3f736abf1fbeb7
Author: Daniel Nylander <po@danielnylander.se>
Date:   Fri Mar 16 18:16:47 2012 +0000

    l10n: Swedish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 6ec552e8905c37845dab6be74c01b75673dc71c7
Author: David González <pico.dev@gmail.com>
Date:   Fri Mar 16 18:15:06 2012 +0000

    l10n: Spanish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 63d660ddb56c25dea0b4567105d1e6c21719f8a3
Author: Tomáš Chvátal <tomas.chvatal@gmail.com>
Date:   Fri Mar 16 18:13:13 2012 +0000

    l10n: Czech update
    
    With Martin Zicha and Václav Pavlíček contributions
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 0827ca55c5401ad8c534039585693ffd761b480f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 16 15:19:48 2012 +0100

    Lua: update README.txt
    (cherry picked from commit 94dd5e7fbb7c6a6b35a1b1d11ef70ae2fb428f9d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c8bc962e100356ca47ba2267e11768dc358eb43d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 16 15:55:58 2012 +0100

    LUA: limited and DEPRECATED comeback of vlc.misc.functions
    
    Only version, copyright, mdate (NO mwait) and *dir are present.
    ALL of them are outputting warnings.
    
    None of this is in master. This is for smooth transition ONLY.

commit 717ff04f8126597266c512010f55bdf3a1aeaf9f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 16 16:06:23 2012 +0100

    LUA: deprecate functions vlc.misc.*dir

commit 2f8221abdcf485ebd3674d5878ccca1c4cfb0773
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 11 14:29:54 2012 +0200

    LUA: Add vlc.config.*dir to deprecate vlc.misc.*dir
    
    This is partially cherry picked from commit f7ee3edcc510959cb85ffde3c350df8c36123c4e
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4f696a88ec9544b98e22ee45e010869717608bd2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 16 12:56:18 2012 +0100

    Update AUTHORS

commit b71354a121c05a12ff58905807cd1fe6c9a8d89a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Mar 16 11:38:01 2012 +0200

    Fix surrogate detection
    
    (cherry picked from commit 8bce50f4b059f638d5f92323e6fec8c5318c432a)

commit 748381c77cb5a17543eac8bd6fc0cd8f791b589a
Author: Ludovic Fauvet <etix@l0cal.com>
Date:   Fri Mar 16 02:04:53 2012 +0100

    Qt: additional fix for uninitialized time tooltip
    
    This is neeeded on top on ab05bbd17efddc95596cd3cb2dfc281f942082d1 for
    2.0 only
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ab05bbd17efddc95596cd3cb2dfc281f942082d1
Author: Ludovic Fauvet <etix@videolan.org>
Date:   Thu Mar 15 22:39:22 2012 +0100

    Qt: don't try to show an uninitialized time tooltip
    
    (cherry picked from commit 0891bbe75522d1c523ae75063ea7c1d0aedabc23)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 041b92e469455a6193e0fc0fee8cb567079cabe6
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 15 20:22:57 2012 +0100

    macosx: cosmetics
    (cherry picked from commit 087fbc42182507dea9fb8bbe49ae7c3b7cbfbe52)

commit 64a0715bb7b133526813b8ffec02da88d4a29f69
Author: Michael Feurstein <michael.feurstein@gmail.com>
Date:   Tue Feb 14 17:16:51 2012 +0100

    qtsound: bug fixes
    
    fix for selecting the device with the correct UID
    GUI and qtsound now both reference the correct UID
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit fd75aab3d6670f7404e1c3e741a87587481472f4)

commit 384feaeb8968a6ecc8bf4e5162fd5647d440ffea
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 15 19:56:40 2012 +0100

    macosx: make sure that the options in a module list are displayed in the desired locale when displaying the simple prefs (close #6385)
    (cherry picked from commit 54205a270031f83867599a45201e4f2da2c46652)

commit 9830cc6dec623a65d0d2d74546e8795eec8f1d89
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 13 12:31:53 2012 +0100

    Update NEWS about security
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f16c09d626cf3290d65101720c31a7f2560e7157
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 13 11:18:12 2012 +0100

    RealRTSP: Fix Heap Overflows
    
    SA-1202
    (cherry picked from commit 19bd7f7b3058619d7677afa96b38924e1422c4d7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 11a95cce96fffdbaba1be6034d7b42721667821c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 15 17:59:33 2012 +0100

    MMS: fix Stack overflow
    
    SA-1201
    (cherry picked from commit 3a57afee14a7f00fd6ff0cccb90a60923ccf766d)
    (cherry picked from commit f5cb63575c65be2719ed8f2cad0e4dff7f288872)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fffe51c43e5932192386143316a9ed49613433e4
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Thu Mar 15 16:07:34 2012 +0100

    mention ogm fix in NEWS

commit 0ba29d9ff1d851cd68b5c91c62294c8de8d0a2f7
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Wed Mar 14 11:38:18 2012 +0100

    fix ogm header creation : do not copy structure to file directly.
    (cherry picked from commit e1b2c3bcb3927e6404f40ea4acff946b27c7ecaa)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 2e475b27b0c535a40b96f66b5703e7f2a83b8f84
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Thu Mar 15 13:17:07 2012 +0100

    sap : smooth the announce period average
    closes #5462
    (cherry picked from commit a04e845438d54c85defa00713bddf9683f9e0993)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 2234919e00c781ee7368cccd330a08eed6319054
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Thu Mar 15 10:36:07 2012 +0100

    typos
    (cherry picked from commit 6f7d72abf437bacba04be811e72bb6c7758f8805)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit a72808787e4d5f6c5f6dc819e1c3d8a5c1626345
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Mar 15 09:39:38 2012 -0400

    contrib: dvdread: resolve OSX mount points properly
    
    getstatfs seems to work better than getfsent
    (cherry picked from commit 701763cdbc92e08818ceb2eb44726c98b20f0d18)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit d678fec8d306588f28132d3215ea5017f766b303
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Mar 15 10:35:16 2012 +0100

    macosx: only pause on minimize, if window with video is minimized
    (cherry picked from commit be3ffe18f1ab6512a51cd96764177aa2c71f98bf)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 0919f0cb438fa576a52fa471ea94029330b8a869
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 14 20:49:00 2012 +0100

    macosx: when main window is hidden, let playlist menu item only display the window
    
    Furthermore, this commit fixes close button functionality in dark ui style when video is playing
    (cherry picked from commit 2709f26e4112d8f1745cec7893efeb45368bb814)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 9459dd3a4179bbf6a2046e69790c35f90b7b9bdb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Mar 14 18:18:05 2012 +0100

    logger: fixed default log location on OS X
    (cherry picked from commit 64637de2753e3ff571a703ab540af181359e9e86)

commit b8723d774dd5ff791420dda5b770d5c1cfdbf672
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 14 16:38:46 2012 +0200

    sout standard: obsolete "group"
    
    (cherry picked from commit cdf9d7ce729d9dbb1f9deddd9dde331667c33d65)

commit 036d7985ae3c1b11ba44a0e22dac16c1af307a51
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 14 16:35:41 2012 +0200

    RTP: add an option to control the category
    
    Reported-by: Vincent Vinel <v.vinel@gmail.com>
    (cherry picked from commit 11f1a3ea832ab8c69013de2f0631afda3a5c53ff)

commit dab282c1ba00c3b7c0efe66f61c8eca84aa441c1
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 14 16:33:31 2012 +0200

    SDP: send the standard "cat" attribute in addition to "x-plgroup"
    (cherry picked from commit 6b5b319c452a328f93f6466eb9b934eb1513d266)

commit e622d04e01000d5fb0890ec68edb845b0b2af3be
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 14 16:31:50 2012 +0200

    SAP: deal with the standard "cat" attribute from grouping
    
    Fallback to the legacy VLC-proprietary "x-plgroup" for backward
    compatibility with old VLC UDP streams.
    (cherry picked from commit aea7f120cac105e66b89443a2e50e3b68117732f)

commit 5da825010510ac37ab50e5f42ecb3d7a42a827b1
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Mon Mar 12 14:55:09 2012 +0100

    skins2: fix mute behaviour
    
    The skins2 code checked for the audio volume to be zero. However the audio is muted with by caling
    the function aout_SetMute() or aout_ToggleMute(). Use aout_IsMuted() to test for muted audio.
    (cherry picked from commit 4f96ae4a9bf70543b421e1b039cad0356a696b92)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1dac0eb8a4c2c02a98c293300ffa3409a9ac2ec7
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Mar 13 15:14:51 2012 +0100

    qt4: Fix PLSelector when a discovery service fails to be created.
    (cherry picked from commit 043553e769dc66d1e891f68723456c294f1c31f5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4e2ccccd57bac9f544b62bf0ff3da4e459541fcc
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Wed Mar 14 00:08:40 2012 +0100

    Qt: open disk: fix tab access order
    (cherry picked from commit 67e869c503d39d443de598d8f4bba4d48b79330f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6cc4d347d3fdc2b2b6479792e02d5395defae822
Author: Denis Charmet <typx@dinauz.org>
Date:   Tue Mar 13 22:29:02 2012 +0100

    MKV: Don't ignore user preferences for track selection
    
    Fix #6375
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 22c24d5aaf7a41f8f0a3beb49039ec8415767263)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 50b9f77612244abde1e23de2710977a475f104f0
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Mar 14 10:16:32 2012 +0100

    macosx: priorize native fullscreen over non-embedded window
    
    This fixes some problematic behaviour, when the user changed some settings
    but has still not made a restart.
    (cherry picked from commit 511519e3420eb716616f321f3d0bc630c2261414)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 815bc9ddadafb78f6d727ecdf047bb4ad9df85e1
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 13 20:13:49 2012 +0200

    FluidSynth: add gain setting and better default value
    
    The default gain of 0.2 was way too low compared to other audio codecs.
    (cherry picked from commit 3ead74ab142286d39f1f155569a3f389d7e5f28f)

commit b45bade9d22c6853b2c0382ab17c97ff3553794e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 13 18:17:57 2012 +0200

    Linux DVB: revive --dvb-device to support multihead adaptors
    
    (cherry picked from commit ea4e38b539b4c0a4b36d047292a84ad92b6bed25)
    
    Conflicts:
    
    	modules/access/dtv/linux.c

commit 8c011362f036ffd0c01a9f9dd2ed237541747619
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 11 17:01:20 2012 +0200

    Linux DVB: factorize and revector frontend probing
    
    (cherry picked from commit a9862530656860c69d51d8a8fbe75baae0149e91)

commit 9178d095fc9b3d5b36f2c7489b2482fb2bfda5da
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 13 18:14:57 2012 +0200

    Linux DVB: do not run ioctl() on fd == -1
    
    This should fail safe, but it is still ugly.
    (cherry picked from commit b517ac74d7a2d7b8c104ec3f3ee1f6d56f78581d)

commit c9c04bd360b91002101492db8df3ce767fdcfe45
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Mar 13 14:09:29 2012 +0100

    macosx: group methods in simple_prefs.m for better clarity
    (cherry picked from commit 31f985a586958bfb31779936555e4bb98cebc71b)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 193bb48cfd793bcbd48f148107c8e3e958aa1ef9
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Mar 13 13:24:01 2012 +0100

    macosx: disable native fullscreen checkbox only once
    (cherry picked from commit 5ff8299fade511fbee60df13f0dfaf94d72d5fd6)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 1b2a1c83325633b1e78e27f739ffaff9f6959640
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Mar 13 13:22:07 2012 +0100

    macosx: implement double click for hotkey prefs
    (cherry picked from commit d6d758229aa634c95373de579e182e357b7c78af)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 5eaed79f225b9231399de2989cef297a0bcf0885
Author: Clément Lecigne <clemun@gmail.com>
Date:   Tue Mar 13 14:06:59 2012 +0200

    ty: fix out of bound read on corrupt files
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 07616a8ecb95cdc0e3059b9b3f0c4a5393b1c773)

commit b7191b85cc5f40fd37ae3d3de80792212ee8a725
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 13 13:25:19 2012 +0200

    DTS: rework post audio_filter conversion and fix buffer size
    
    Although this was not reported, this suffered the same problem as A52.
    (cherry picked from commit 6493879248c4ea2d13f794bda75144e13a12399f)

commit 18ea923eaf3a2be8824c6ef2b57d4f32ee925b2c
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 13 13:20:31 2012 +0200

    a52: cleanup and fix buffer size
    
    This closes a heap overflow on corrupt files.
    
    Pointed-out-by: Clément Lecigne <clemun@gmail.com>
    (cherry picked from commit a6e127f134e42f5d1d5ea9d9b8d055ce42e8caf8)

commit 5e0c3e5af55efb5af14dd43199b08a36b8f3cd2b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 12 13:34:59 2012 +0100

    Qt: limit the size of the comboBox for network open.
    
    It behaves badly on Win32
    (cherry picked from commit 829b5a923845e3b3f6a7c57c90060410bedb47b3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 898c4c30482ed9616fcca3ae612aa88d420f4e1f
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Mar 12 16:22:10 2012 +0100

    hls: Fix parse_SegmentInformation error checking.
    (cherry picked from commit fc50e57ad33d9ede13e435267e9dda3d30501711)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8022324cb0205cd91e9d4598f10a6e7bd40d3d84
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 13 12:15:25 2012 +0100

    Contrib: update tiff to 4.0.1
    (cherry picked from commit dede0c9527d3372e70952a677b57a7167a0a48fa)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d629a48bea348dc6a524982862c5ec16c649e8f3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 13 12:28:48 2012 +0100

    Contribs: update freetype to 2.4.9
    
    CVE-2012-1126 up to CVE-2012-1144 and SA48320
    (cherry picked from commit b737cac862fe1807e9026c5bfcb9966d3b44cf4a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 63ab47c5bd483edf409030c7774864a7c6755c82
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Mar 13 12:01:20 2012 +0100

    Update recommended libav sha1

commit 589a19ecdbbdc3f3695db177c584630496ad22a3
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Feb 2 18:27:04 2012 -0500

    contrib: don't depend on headers available in mingw-w64
    (cherry picked from commit bdb36c1b184cd62ccc633b493d5c8fe9e21770ed)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 1543b6a1ad983862465fb120a2850efa15ddb575
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Feb 2 18:23:20 2012 -0500

    contrib: detect mingw-w64 (as opposed to mingw.org)
    (cherry picked from commit 521f40906c11615b9da6fabb19870724b91769fb)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit e1f6de115c0413244983cc017b9ba9f7fa38b842
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Mar 12 22:46:33 2012 +0200

    Linux DVB: remove dysfunctional "dvbt" scheme
    
    It is redumdant with the preexisting dvb-t scheme and does not even
    always select the correct delivery system. Also the failure mode is
    much more confusing than a plain error input failure message, and
    it is inconsistent with other delivery system names.
    (cherry picked from commit 06a2a739e76f8c05776be0f84faef049a2505cec)

commit 60038b3fc188da92bb2cd2cb20df55c31439a98f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 12 20:29:43 2012 +0100

    Contribs: Update ffmpeg sha1
    
    Close #6180 and #6153

commit a2a951f3fa1f568bf56ade05e81edcc1a199faab
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 12 19:20:17 2012 +0100

    Qt4: do not delete useful text
    (cherry picked from commit c26ef9bc31a6ecd06dd4272e9139e6611e2e1294)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93db955681c7d938f1ef3450b6bb883efd6c99bb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 12 12:21:53 2012 +0100

    Update NEWS

commit 0a01451b7aa1d16c06e4de9be75a5f117f5ea087
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 12 10:17:36 2012 +0100

    Register 669 extension
    (cherry picked from commit 94566cadba9a5bf107bdc89a96020b9020ad3468)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e204e192f586e21d702269f5d3a63da7b1657ed1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Mar 11 18:00:27 2012 +0100

    Qt: do not loose fullscreen controller after customization
    
    Close #6116
    (cherry picked from commit 126679799c39ee3fec9af2fe52c1287e974b91ee)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 68827e62079b8086a151f860af5e7da6c57e0192
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Mar 11 17:10:51 2012 +0100

    Revert "bluray: properly suppport FIRST_TITLE & TOP_MENU titles"
    
    This reverts commit 6afa23b2dd9e3f526aa59c5d1ee727d2ce249e78.
    This was breaking length computing, thus breaking seeking.
    
    Conflicts:
    
    	modules/access/bluray.c
    (cherry picked from commit 2013440e126d56449a749517592affc2b901b67d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 445d60a36f8ef18102121c29c1d8498e21862fce
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Mar 11 16:57:33 2012 +0100

    bluray: Fix seekpoint updating.
    (cherry picked from commit c68373380984bbf16687997e426b25ac90558751)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e0bd1e86add317c39b23619608c0d97bbb6c5f37
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Mar 11 15:57:31 2012 +0100

    bluray: Don't fail silently.
    (cherry picked from commit db56ab24bcd6319316fc1d0308ed28b66a8d5477)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 26f630e110a4f8e4d75f3dabdf5e874c90e9b16d
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Mar 11 15:50:49 2012 +0100

    bluray: Fetching meta info isn't mandatory.
    
    This should fix bluray playback on windows.
    (cherry picked from commit 12bb4f9d52832dafb493d0c0241b154cbdce251e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b2eb0df386c5b3a9dbf133ac48773e26a16fe76e
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sat Mar 10 15:54:43 2012 +0100

    bluray: Check for read error when menu are enabled.
    
    This fixes crash with BD-J menu, if libbluray isn't built with java
    support.
    (cherry picked from commit 3bc5c401996090ef409d0c76fd59c1d009b80c00)
    (cherry picked from commit 96b0289176abe5a24eb1f854e74654b3c55d0574)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5f401c33aba636971555efb4cd1707b52d5a415b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sat Mar 10 15:52:23 2012 +0100

    bluray: Check for bd_play failures.
    (cherry picked from commit 207e13c211c1af905bf567934457fd5c91031856)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 97c0d7749f21bf7f49973f2dce7c6018f508c0a3
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Mar 9 16:36:50 2012 +0100

    hls: Fix floating-point value duration parsing.
    (cherry picked from commit 08a2a6031b83a4a227c785ef46121b2fbd289b06)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit de31065a9f80304856e550b1ac5fbf92ec7fc730
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Mar 9 16:34:59 2012 +0100

    hls: Avoid using errno.
    (cherry picked from commit 7eb141b4800273870a95210a98c6464416a3b041)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f3e2738e23a68edd872571dccf177fa05a135328
Author: bbcallen <bbcallen@gmail.com>
Date:   Fri Mar 9 17:36:31 2012 +0800

    hls: m3u8 parser should pass 0xD at line end
    
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit 8a57032172f9e6c737036cac6fe8f2e530ac21f1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 98d157ad3339aef47ad10d39a7879d39e9b806ec
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 12 00:22:47 2012 +0100

    Contribs: update libdvdcss to 1.2.12
    (cherry picked from commit f55a160da54be5e09576947388f5eb60d0d224ff)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e694bdf41e07e7587ea5a32ce7b495f3581c5d46
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 11 22:58:10 2012 +0200

    decoder: pause aout at creation in corner case (fix #6369)
    
    If pausing the decoder races with setting up the audio output pipeline,
    the decoder can end up already paused when the audio output is created.
    
    The audio output insists on a strict start -> (pause -> resume ->)*
    (pause ->)? stop series of state transition. So it must be paused
    explicitly in this corner case.
    
    I have not investigated whether this problem affects the video output
    but this seems very likely too.
    (cherry picked from commit 092e8242e786dfef3568dabd654e3d886c7534f3)

commit 88a67f9e512ccba576c59c7f94d587808e6b9809
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Mar 11 18:40:10 2012 +0100

    macosx vout: also do crop if macosx-video-autoresize is false
    (cherry picked from commit bb20070a980134c728d5d57c9203784006f5a82c)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 313cdcec6f1b830e13e98a946795321a649d0406
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 11 16:29:37 2012 +0200

    Linux DVB: small typo
    
    (cherry picked from commit 9df024608bdb087f26bff309ddcc9d686e0353d5)

commit f1a895b316a8a89ac8b8c8b4358f30afca6c4918
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Mar 11 16:27:07 2012 +0200

    Linux DVB: fix format string
    
    (cherry picked from commit 42b8a557d6f0045c2a3a06a9ff457ce2a9cf7144)
    
    Conflicts:
    
    	modules/access/dtv/linux.c

commit 27b54aafb7629378f47fba0e3028d645587e9159
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 9 14:04:48 2012 +0100

    Contrib: Lame, forget the sha512 update file
    (cherry picked from commit 411132d9a6511283f4535066dc765658e3a4c01c)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 71cb14787bda31448a79b993ad77688786681105
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 11 16:08:19 2012 +0100

    macosx: fixed 'Open File...' in the subtitles sub menu (close #6352)
    (cherry picked from commit 542b07d310adad4692455396ffa5d52f3fe666b7)

commit a194b4cd7b9b6851493f5f67d4dcca3b7d0938aa
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 11 15:30:29 2012 +0100

    macosx_vout: implemented crop support (close #6080)
    
    note that this patch includes a hack to revert to the 'Default' state correctly
    (cherry picked from commit 1d4f6a974f9b04873ba9ef5f016053364ef62836)

commit 0a0a242c9a6ce40fea8f59685fdf7091cc62ad2d
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Mar 10 20:36:29 2012 +0100

    macosx: disable native fullscreen checkbox in prefs if a change would have no effect
    (cherry picked from commit 50134d9405852b74a9844e44f154049a91eaef9e)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit d74d16d142c2d60392a395902fcf2e9ec2c8ccb9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Mar 10 18:18:42 2012 +0100

    macosx: allow to hide the drop zone while the playlist is empty using an option-click on the playlist toggle button (refs #6213)
    (cherry picked from commit 51cbd1c24870eec1b386ee978d4ebcaae4a0ac9e)

commit 6d46730b31ae26c4c1cc1be922bdab55dcd063b3
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Mar 9 18:41:16 2012 +0100

    macosx: changed the playlist toggle button behavior (close #6213)
    
    it behaves this way now:
    
    - no video => toggle window minimization
    
    - active video in main window => toggle playlist / video
    
    - active detached video => toggle window minimization
    
    - active video in main window, option click on button => toggle window minimization
    (cherry picked from commit 797ca65c8f545a22d02ed676711e6f254d5b5dc4)

commit f2d3d72d35f36f545e8428fe0cc08c50a9d1e79b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Mar 9 17:58:26 2012 +0100

    macosx: fixed DVD playback using libdvdread (close #6027)
    (cherry picked from commit 4106e42f145faa3534788a58fec9d6eae59ae7e0)

commit f2724d6296737ac51352e041125dee5489438ae1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Mar 9 13:55:00 2012 +0100

    macosx: fixed playlist and close entries in the Window menu (close #6239)
    
    the playlist item automatically reveals the main window now, in case it is hidden. the close item correctly closes the detached video output window now, when using the gray ui style
    (cherry picked from commit 77956b05910b44ee764815e08c0e5a52a0d984ed)

commit 93aaf6cf1b18344eb0f10c3ce6335b9e58b79747
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Fri Mar 9 08:31:05 2012 +0100

    live555 : fix quicktime audio codec settings.
    (cherry picked from commit 52d209b83b69cd0a0576a41976b3d8d8926178eb)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 34089319779eee7fdfa112debefd1e3f23c24fa9
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Thu Mar 8 15:22:45 2012 +0100

    improve mxpeg detection : there are some cases where the jpeg comment is not included
    (cherry picked from commit 1cb530379f592f7308fd87b70a0267157894ccea)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit dd22509c567bda5e0937747c1b9b9c259605f06e
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 13:03:14 2012 +0100

    bluray: Removing useless title management code.
    
    As pointed by fenrir, this is already handled by the core.
    (cherry picked from commit aef79d832965b10a923aa47b89475ae44bb11b53)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a001905266e86f51054ddeeb2f10bd13c27871a0
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Mar 5 18:54:11 2012 +0100

    qt4: Adding support for bluray menus
    
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit 6a72420a4526146b65f87b778e010b9ce52895a9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e5c42ced3065ca3e0de602256982659f46588737
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Mar 5 18:54:10 2012 +0100

    qt4: Open disc: cosmetics
    
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit 93154b676439e2dadb4a27b72b4c432c860532be)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 88daf1033606304102e5ba23d7eb62c3c1309dc1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 8 12:36:31 2012 +0100

    Bluray: kill warnings
    (cherry picked from commit 339983794cf5faca77706e2ae7a4f765d2e1cff8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c0821a3fad6ca299810b9e1d1ed5befa0d5b91e7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 8 12:33:03 2012 +0100

    Bluray: cosmetics
    (cherry picked from commit 24961b3535b186d29dea57804c6f7ddbd905b754)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c73229e1ed2005574e8278f26940c07f068d005a
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 12:23:32 2012 +0100

    bluray: properly suppport FIRST_TITLE & TOP_MENU titles
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6afa23b2dd9e3f526aa59c5d1ee727d2ce249e78)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8ba3e95ced41eda38b4d1a1ddc6ac78e98a2833c
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 12:16:33 2012 +0100

    bluray: Store the meta informations in p_sys
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 425ee6e926369f3cb02033fbf60b5898ed19fff9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0cb62d1350543759349a215edaeb832430fb9334
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 12:13:37 2012 +0100

    bluray: protection against incorrect paths
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 11e721fa2da7eaf8a0088afc9e2caeedaa59af56)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7d7e2dd339ec29deef264711bba56eb4ec266dc5
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 12:11:23 2012 +0100

    bluray: Handle mouse events
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6ae6943bde14ce79ded3ddefd0f4372456949cfc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f0b52e34cd38c5e72ba54e060edb157636d9263f
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 11:51:42 2012 +0100

    bluray: Add support for overlay
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 70d36ebbdcfd0c787d605e676699632442365f51)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3d7ba9aedd7a7a312217420612586f6950f4ca3c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 8 11:53:25 2012 +0100

    Contribs: update LAME to 3.99.5 because of a .4 regression
    (cherry picked from commit 0889b46df014d64833bfbbb1b8426161f5c0522d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d011a986a719f718918423c419de09fdb5c755fe
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Thu Mar 8 11:12:22 2012 +0100

    More mailmap fixes and simplifications
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e509433c1517494fbde32ded8c9101f12102029b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fd9b06ae95a00bfcb2cc91c002b732315d313fbe
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 8 10:37:06 2012 +0100

    Contribs: use mpc tarballs and not svn
    
    The svn has not moved in months
    (cherry picked from commit b6eaf679d930ae2888ecdcfcb605fd49dd38a929)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0fc9002d28d2f10122714c0bf9bdd9f7712935da
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 01:41:27 2012 +0100

    bluray: Hack to avoid crashing when changing title.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 694f1911aabc828fe206984aa177879a304fb269)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 55a68bb230bb4bb5033d39d68292fff6b0f41659
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Mar 8 01:36:45 2012 +0100

    bluray: Prepare menu handling
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 17f7243ad4a893b58ee1c2f8380328f3da7e9728)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3a10d93ea121f5616ad110e47487b651434f9f3e
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 23:03:59 2012 +0100

    bluray: Fixing a warning
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 091a42674c70a913fab99d868a7e37ea0eb0d2b0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7b71bc6bf53edc867af427c42fe12f0859b59386
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Feb 15 22:14:05 2012 +0100

    bluray: Adding some event handling basics.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b7be0b26727077e2a617c486df0e162db1825a18)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f3b86d685086a49daf3a33cc38f2239f50f55530
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Wed Mar 7 01:18:00 2012 +0100

    Improving .mailmap
    
    Mapping some contributors to the same email, fixing jb adresses and trying to
    pick the "right" name when 2 are used by the same person
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit dc28b94159fec2deba1b5ea1d1b4a1d3ddbe79c7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ab03db2390d1fa0f6c0e2e36ba3d1f4e804dcfca
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 6 18:49:00 2012 +0200

    contrib: modplug: merge Libs.private into Libs for static linking
    (cherry picked from commit 534a93219daa4b252b5f9d196c009784588ee42b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7b40d6e878875979cf1ccf3203a8c3b72ce0308f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 6 18:48:29 2012 +0200

    contrib: helper to merge Libs and Libs.private in pkg-config files
    
    pkg-config is unable to autodetect whether a package is linked
    statically or not. This helper just moves Libs.private into Libs
    manually in case only a static library is built. Most if not all of
    contribs are built that way.
    (cherry picked from commit 3ce29fe10e2e9813452abbbd1a0aaaea07a57411)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 23b55adc5b2a776df41dadf17b2eb0bf1d084766
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Mar 7 17:38:07 2012 -0500

    Win32 one-instance: fix mismatch in ABI on win64
    
    86f2f7329b1b4 changed string length storage from int to size_t but did
    not update the receiving code.
    
    Close #6084
    (cherry picked from commit 24bd745705ae6017552678a20f1418c06ed81376)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cfc6a9bf40be5c78c0d53bbc7a7f79f1d76b1ca2
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 7 20:25:11 2012 +0200

    ALSA: refine buffer / period parameters
    
    We really need at least two periods: with only one period we could hit
    a buffer underrun after a buffer overrun (a REALLY dumb failure...).
    Then we have a favorite buffer size. Then we pick the least number of
    periods to reduce wakeups (but at least 2 anyway).
    (cherry picked from commit 2dd544eb847556972c6bdd49e1eb0c281122f448)

commit d31ca17bc7d3297e641f100ec281610bd6991f2d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 7 20:07:01 2012 +0200

    ALSA: fix selecting the audio format
    
    If set_format() fails, the parameters are unrecoverable.
    Use test_format() instead.
    (cherry picked from commit 2a66249d1b9773b7ba2f6ebebbf8619c1f339de7)

commit 43a5474ad251e454189e3a8a1c458854a09536a0
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 7 19:29:42 2012 +0200

    SRC: default to fastest SinC
    
    It is good enough for normal people with only half the CPU usage of
    medium quality SinC.
    (cherry picked from commit c07d0c4cd35b7a91c0f9428144a14bbf29750898)

commit 29317fb1d45bbf7159fc1cf98b3348fbdbfd7d75
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Mar 7 19:07:57 2012 +0200

    Fix mixer leak (and crash at exit) when audio output fails
    
    (cherry picked from commit 4f292d82afc5c069855572f0d00919edfb394cf8)

commit d5922c5277edecd504eb1e3ffd0b83cd7aac8717
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Mar 6 21:30:18 2012 +0100

    macosx: when we currently play a video in detached window, allow a 'show playlist', too
    (cherry picked from commit df071469ea293d66d4d4288f16150b76902ba86e)
    
    Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

commit 78543b89fe27c7728a6210749cb29264d15c7c58
Author: Jon Stacey <jon@jonsview.com>
Date:   Wed Mar 7 01:25:26 2012 -0600

    Audio: Core Audio: Initialize starting volume for analog devices.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 29f33902b603620342bd5420f46dddfc41ae0ddf)

commit a8102fbdf3d13f4aedc2e197e88afda39094d8e4
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Mar 7 10:21:05 2012 +0100

    DVBsub: split encoder from decoder
    (cherry picked from commit 97761da66cb72a23b12fe3c56ac70936ab7480ed)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dc1b7eff67f4c225f7dafa22bcf80fca587d6e54
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Mar 6 19:54:13 2012 +0100

    macosx: fixed execution on OS X 10.5 (close #6282)
    (cherry picked from commit 7351e9519832178e2fe5f27bbdffa2e5cb949b4d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a7b544a41e5daa04dd8844de55eb24842fe95964
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Mar 6 17:52:59 2012 -0500

    HLS: fix IV parsing
    
    Don't assume IV has 32 digits (leading zeroes are not mentioned in the
    spec)
    (cherry picked from commit a75552b81ca070dced73f42873c3c52c4d75f4a7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ec29285a6b38c33996a0d28a563e2c10c15f7afc
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Mar 6 16:56:42 2012 -0500

    httplive: aes_key is not a string, neither it is NULL terminated
    
    Also don't use a temporary buffer to read the key
    (cherry picked from commit 2f128d5938387f0b52b2b16bf6556a2335d2447f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58d8477e1ff288c0f650f43555fed153a9c024f3
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Mar 6 21:12:42 2012 -0500

    android: update config
    
    enable gcrypt
    remove portaudio mention (it disappeared)
    (cherry picked from commit dd55afb6b19f77d14928f357c9924289c34ec4fd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 492512440e79fc9de5d9f906dcba7d990aa3ac57
Author: 某因幡 <tewilove@gmail.com>
Date:   Fri Mar 2 23:27:45 2012 -0800

    android: build gnutls
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit bead358b379601eb4be6d9914bd3379ff73b50ba)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93f36d716ecc1d4a10212377b3a12b93cadabf9d
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Mar 6 21:04:08 2012 -0500

    contrib: gnutls: missing limits.h
    (cherry picked from commit ecd92c1dd91675e61ba69aac6e72277f06bd7abf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b55752f36696ef03dcda026c42274749cc305807
Author: Jon Stacey <jon@jonsview.com>
Date:   Mon Mar 5 00:54:35 2012 -0600

    coreaudio_lag_fix.patch
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 93a0d5ab5b51d369c20f933f379ad4934daeb7bf)

commit bb7866cc0bab8dcd33e56b174876c3571c8ef9a0
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Mar 6 18:10:30 2012 +0200

    ALSA: do not turn off softvol
    
    Some people actually use it.
    (cherry picked from commit 20ee3d9d6e7586f778905cb048872dd5c5ae8ce3)

commit 5cf7a0393c1309993c1dd809cb9edd919ec38afb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Mar 6 13:42:31 2012 +0100

    macosx: added additional artwork for the single fullscreen button in the detached video output window
    
    derived from previous artwork for other single buttons
    (cherry picked from commit d17ed613ebfa4b473bf9d4270d2df3a9f37924fd)

commit 908e8090f5636e023909649472f7359feff84478
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:55:35 2012 +0100

    macosx: redraw the playlist view on selection change (close #6316)
    (cherry picked from commit 43b0c46d145dba1ea51e464d48af35bd2f3cbc83)

commit aa797220da1cf55ec829399dd8d827aa1c4b6a54
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:52:07 2012 +0100

    macosx: fixed compilation warning
    (cherry picked from commit ccaeb4ab6ede00476172969fe61943ae8bde84af)

commit 169f866b350d2ce0c4c25a738de7360510d9dbf4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:43:35 2012 +0100

    macosx: fixed aspect ratio and crop commands by removing a no longer needed hack (close #5921, close #6080)
    (cherry picked from commit 6460f5112b5fd825a89e9545a5a0977bd9d75089)

commit c070223c45316740a081463eb19ed042248799a6
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:30:20 2012 +0100

    macosx: minor ui fixes to the detached video output window
    (cherry picked from commit 0a3ae653ca1029050bdabf18ce921cca66ba08e9)

commit 6999dfdcaf241f1acf6768fbb63cca42582d57b9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:26:06 2012 +0100

    macosx: fixed crash on quit while the video plays in the detached window
    (cherry picked from commit 48897cfc6d9bbd43ef2e9d6a5369210dde3d8b8a)

commit 9f7609f2ca134273e9ba296cb88892608ff14057
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:20:11 2012 +0100

    macosx: added window title to the detached video output window when using the black ui mode
    
    code needs factorization with the main window
    (cherry picked from commit 9b3cf5b99725417958a2fb30cb0f64eac04b1524)

commit be825b77dab77e9f82b25181357c9a4caf80de27
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 20:11:16 2012 +0100

    macosx: remove debug
    (cherry picked from commit 43b4b04b69c273aea2156b5b64bf510b606f5252)

commit 7b80f575ad8bfbb0d03f00ad393f1cdb1851faff
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 03:10:50 2012 +0100

    macosx: implemented playback controls for the detached video window (bwd/play/fwd, position, time, fullscreen)
    
    2 things todo:
    
    - get custom artwork for the fullscreen button
    
    - implement window title when using the black ui mode
    (cherry picked from commit 05a4b8a6f245d3487570dfee38bacad4a03175de)

commit 0afe7c389d66a54544dc8b34114eedfa93d12458
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Mar 5 19:47:39 2012 +0100

    Mention HLS for win32 in NEWS

commit 427883e95dbfb8cc21824ae3797ae71128cb0686
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Mar 5 11:15:27 2012 -0500

    httplive: fix stream detection
    
    Using str*() on a bytestream is a bad idea.
    (cherry picked from commit 74f02326dc168aa632fe68c29951cf3824dfce06)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e9bbfae40f5cb705efa24cb6adf9d6877acb1bc7
Author: Chris Smowton <chris@smowton.net>
Date:   Sun Mar 4 22:17:33 2012 +0100

    hls: Fixing bad length computing.
    
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit d0590ad182d82c5c856b8b4555bce93d5ccc1fb6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a8a12cbd6d270ddf06374eceadefc60cbe6c769d
Author: Chris Smowton <chris@smowton.net>
Date:   Sun Mar 4 22:15:06 2012 +0100

    hls: Fixing backward seek
    
    Fixes #6261
    Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
    (cherry picked from commit 0307c51edc4a04f9ef28c1806941483fd280578a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 29742a51f1b33a10c750bd0067b72a74dc632430
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Mar 4 21:50:45 2012 +0100

    Fixing HLS on win32.
    (cherry picked from commit 7573128aa74cd02d78269c8ff9d9aa30337ef859)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit aad03ab250ae7e46e5390c8824fcc5a422774228
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Feb 24 15:14:20 2012 +0100

    hls: Removing unused parameter.
    (cherry picked from commit 9db8e1cb64279947faea3d605fe3f99d7b74ce11)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5333e970453750552484931a6afef484c8dfdc50
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Feb 24 13:30:08 2012 +0100

    hls: Removing vlc_url_t
    
    They where only used to be converted back to char*, which is useless
    and error-prone.
    (cherry picked from commit 67530424186f0473c201d393fb71eb873dab72a7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 154826379f59b0f272cd0ffcfd18205a431aa37b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Mar 5 16:44:46 2012 +0100

    qt4: Removing debug
    (cherry picked from commit a3dce49a0fd8aba7e62ce72b732e80e3bf1401da)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c6ccdf22bc5f2179097a259a9a5f89b6cabedb0e
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Sun Mar 4 19:29:43 2012 +0100

    libvlc: inform that the option was deprecated since 2.0.0
    (cherry picked from commit 1bde880702e7a8913205ed0f491e9a223dfaae48)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 11c5146b84177058df447889b8fc434f4b60802b
Author: Rémi Duraffort <ivoire@videolan.org>
Date:   Sun Mar 4 19:25:32 2012 +0100

    http: fix memory leak in the error path
    (cherry picked from commit 69ee998d3c9fe363b1af52ba3ee20fcd2c0a8b0f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ea52eae0eb4a0d1fb219ea193fbbbbe66d1f56d7
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Mar 2 16:38:37 2012 +0100

    Qt: extensioninfo dialog: remove unused member
    (cherry picked from commit 8290233b46cd5e4edcd83d6a5795cda6814f06a7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 92b735eba4e3fe727177ad00a44faf11fbcd376c
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Mar 2 16:14:04 2012 +0100

    Qt: epg dialog: fix base class hidden method
    (cherry picked from commit c86cbfb9b1ebd6af37d47b47d8d982e5df989fca)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 058059c98f6e13917d5bcab5bad9d60da02059ae
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Mar 2 16:16:14 2012 +0100

    Qt: preferences: remove unused hidden member
    (cherry picked from commit 89f039dd14b2bf8da73b08bc23ded28da9044867)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1548821f0418b8c2c5ce08e360644c496df383ed
Author: Maciej Blizinski <maciej@opencsw.org>
Date:   Thu Mar 1 00:55:49 2012 +0100

    Invoke check_headers with $(SHELL)
    
    Otherwise, it gets executed with /bin/sh which on Solaris does not support the
    $(...) construct. This causes 'gmake check' to fail. For example:
    
    ../src/check_headers: $(dirname ../src/check_headers): does not exist
    
    Calling check_headers with $(SHELL) explicitly makes use of CONFIG_SHELL.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit d1a8b724c3923bb37002e5102cae25d9594a9a95)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e0210447c1a9b3c9796e973f16e23f9fccea24c1
Author: Maciej Blizinski <maciej@opencsw.org>
Date:   Thu Mar 1 09:37:48 2012 +0100

    Use libcompat in tests
    
    Otherwise:
    
    Undefined                       first referenced
     symbol                             in file
    asprintf                            url.o
    ld: fatal: Symbol referencing errors. No output written to test_url
    
    This patch uses a mix of tabs and spaces to match the existing convention.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 7b0efebbf38aec8c341ad92433fb218a02bf62a0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6eb79044e71d039829b482c7313af9f78db77bd5
Author: Casian Andrei <skeletk13@gmail.com>
Date:   Wed Feb 22 10:29:02 2012 +0200

    dbus: Prevent dictionary from growing out of control
    
    For each item that was appended or deleted, the ("Tracks", NULL) pair
    was inserted (duplicated over and over) in the tracklist_properties
    dictionary. The dictionary was inserting it in the same position and
    it assumed it had hash collisions, triggering an expansion at every
    insertion of that pair.
    
    Check if the key is present before inserting in the dict again, at
    playlist_item_append, playlist_item_deleted events.
    
    Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>
    (cherry picked from commit 0d3ac6a7df7e205bdaff6e1493abdf1a62fa45b8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7e9873e9008cf1d91af6c47d84d73981129f59ff
Author: Casian Andrei <skeletk13@gmail.com>
Date:   Wed Feb 22 10:27:38 2012 +0200

    Create a has_key function for a vlc dictionary
    
    Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>
    (cherry picked from commit 308259d1ab249c19463c88b382f705ffde1343e5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2f2f083a81f93248d6a993963e5562ebe7b69502
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Tue Feb 28 16:47:25 2012 +0100

    bootstrap: allow calling genmf with non default shell
    (cherry picked from commit 6fa1935b5a4d1894689fac30c358a5b1887677c9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 44b3291511b3b71b87a519299a578969676af95b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Mar 5 17:13:21 2012 +0100

    Update NEWS

commit 58b1bc3a141ebcbcca2a6dafa131eccdfd311c79
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Mon Mar 5 09:47:33 2012 +0100

    SAP : handle legacy v0 where the hash is not set (I forgot this case in c495d676f1)
    (cherry picked from commit d77948263d850f221ac18606f3e0f6c19295d51b)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 44e8a1fb43e1fcdfedc303c3e40724aec72685aa
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 31 23:57:27 2012 -0500

    libav*: remove broken use of log callback
    
    We can only use it at application level
    Just use the default libav* callback instead which prints to stderr
    We might want to set libav* verbosity with av_log_set_level()
    (cherry picked from commit 20155f800ecee139e81babf82b031cc5a8bbb045)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 1edbccb9edafb2faa8d2f6d860ea10d12568cea1
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 31 19:40:38 2012 -0500

    avio output: flush after writes
    
    detect errors and abort writing if they happen
    (cherry picked from commit acf912ad543fd1a26a186bd5765c59c50955c0bb)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 7628b24f8cf0e44800caed8ff33fcb8fed23e88b
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 31 17:45:57 2012 -0500

    avio access: fix setup of libavformat callback
    
    In process-level mode we would call the context-level callback
    (cherry picked from commit 58d5803a30527d3299e890c72484acc9b6de48db)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 09409bfda9ed8b187edfa92483998f7b9a39d8bc
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 22:06:54 2012 -0500

    avio: EOVERFLOW is not defined on windows
    
    Define it to EFBIG (file too big), it's close enough in this specific use
    (cherry picked from commit aa77af7405751bec3f8adfd1c671133261dc9c8d)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 5a53397f1c8e02631b93694a46cf4786c0381298
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Jan 28 23:14:11 2012 -0500

    'SONC' codec is not even mentioned in libavcodec anymore
    (cherry picked from commit 3cb559491e0ade3f98b029ef2e690ea32191a296)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit a24caa1cf5f761df02e4d604a19cab95c34ac639
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Mar 2 11:40:40 2012 -0500

    avcodec: fix error resilience setting (renamed a while to recognition)
    
    The field was renamed in lavc54 and setting values changed from
    enum to bitfield.
    We don't need to care about this because VLC doesn't specify values.
    (cherry picked from commit b3cd3651868cce57d54e94c6662a383f7d94444e)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 7fba272175f8d508ae1c7ab297555cbe6df83667
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:12 2012 +0900

    avformat mux: convert to new avio API (cherry picked from commit 0011b7043c5c9115bf130068265e90142277d2f6)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 66dbb503805c08b263c8355289200e533b4574cd
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:11 2012 +0900

    avformat mux: use avformat_write_header()
    
    Pass its error output to msg_Err with %m
    (cherry picked from commit aca40fdc52ae97e3a188d55af74a0b734b415664)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit c15bec0184899c2d8eb84429ec1d5dbdef2206be
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:10 2012 +0900

    avformat: remove cast to void * (cherry picked from commit 91899a03e70024e68c20603e2c243cb9742898b9)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 07b4be40246575d96f4684772b898bc3f3ba5208
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:09 2012 +0900

    avformat: prefer avformat_new_stream() over av_new_stream() (cherry picked from commit 5dbdccf2fd7829a8a0fb3ccae65ed17f71c7078a)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 2769212fa98f8098007c2d587f9715dcf5bf4add
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:08 2012 +0900

    avformat: put_flush_packet was renamed some time ago (cherry picked from commit a6ebc7d7eb2231939ec94dd5a94bf819fb7c2086)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit b9c17044e4108e71cdd6d2b5e50ea28f2180cc34
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:07 2012 +0900

    avformat demux: fix double free()
    
    Allocate avformat context and set its I/O context before using it
    This is the correct way to it (and is documented in avformat.h)
    (cherry picked from commit c5f388e8e37f38b4526fbca379305a918dd12141)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit fc4a4577a6715c951fa4378342817cd163691fb8
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:06 2012 +0900

    avformat demux: use new IO API
    
    - Use AVIOContext instead of ByteIOContext
    - Use avformat_open_input instead of av_open_input_stream
    - Use avio_alloc_context instead of init_put_byte, allocate context on the heap
    - Use AVIOContext.seekable
    
    print avformat_open_input errors
    
    avformat_open_input is the most recent and is documented as available since
    libavformat 53.2.0 (other changes happened in 52.105)
    avformat_open_input was introduced in 52.94 in FFmpeg
    (cherry picked from commit 4c3037ac45b92853d5d85f7bedebdb4b281da0c6)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit ece5edec14b02637ce69d8a479a1755d86bf0037
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:05 2012 +0900

    Workaround FFmpeg doc/APIchanges lies (cherry picked from commit 5b55c4dbab0ee2700300f9d8b79747a42ef26158)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit f084d987fe8eadcf38440c84c2319290b94b6a46
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:04 2012 +0900

    avformat demux: use new input APIs
    
    print avformat_find_stream_info errors
    (cherry picked from commit 49944dcb5ac7ecc39da86bdb300bd7be8c9d2e47)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit b8f396cd21b787413278fbb3c2b7b69173cf0436
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:03 2012 +0900

    avformat demux: don't access removed info
    
    Palette data is now transmitted as a side data in AVPacket
    (cherry picked from commit 4ca6ef05e16554c71c7480a7b4df59ab3a43f6c4)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit bfabdd55e8b750eb8d0f14a2ccf4a4cf6a72b60b
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:02 2012 +0900

    avformat: shut up warning (unsigned char -> uint8_t) (cherry picked from commit 7df0345e7f8917ae534592caea34eba1bef4c26e)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit c434cdb2c9749f5dc8c9bf17b01941bef27c779a
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:01 2012 +0900

    avformat: AVMetadataTag and av_metadata_get don't exist anymore
    
    They were copied verbatim to AVDictionary equivalents some time ago
    (cherry picked from commit 55c0636c559e3db6cb354306438c83e278430f48)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 91bfde6d536a417cbe9318bfffde884671debc6a
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:03:00 2012 +0900

    avformat: remove 2 chained data structures
    
    They were only used to hold one opaque pointer
    (cherry picked from commit e7e1a0f3bd279ce5fd2bdd4f1994bd7ff5be3deb)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 08a2ad17bd72c71b088117242f1d40cdbdbc0db3
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:02:59 2012 +0900

    avcodec: update to libavcodec 54 (cherry picked from commit 8f24e725ff9945975f6d7232477cff7f7a8e2cff)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit ece2a47ee2abd86bb2aa6a521d41381050fb64cf
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Mar 3 00:02:58 2012 +0900

    avio access: use new API
    
    - fix bug in ACCESS_GET_PTS_DELAY where it would fall through the next case
    - print error messages from libavformat
    - remove useless strdup
    - check for exclusive access to avio when context open succeeded
    - support for multiple input / output at the same time with libavformat > 54 (untested)
    (cherry picked from commit cca698a05ea024a380330e1f3144996bba4c20e0)
    
    Signed-off-by: KO Myung-Hun <komh@chollian.net>
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 41b2b5272a6d44179f6dac42cecfc611265f733c
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Feb 9 20:00:21 2012 -0500

    ts mux: assume dvbpsi_GenSDTSections is present
    
    it's in libdvbpsi since 2004
    (cherry picked from commit 0344812b799fd5aa1db60b91bda8c3d73ced8de1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b7b260e385f8c57bf0b7a2aaecc56fbd5db62e9f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 4 19:05:41 2012 +0100

    macosx: handle Lion's fullscreen shortcut in addition to our own keys (close #6313)
    (cherry picked from commit d7df112353124aa073b1b9fcb741ae24a3e1e7d1)

commit 157b7bbf3328ecc31d5200d96901800accf2fe8f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 4 18:32:34 2012 +0100

    macosx: fixed re-sizing issue with the drop zone
    (cherry picked from commit c3ea7f28b638c8f54ad3463d12e1e3eeb1f682f1)

commit 32865ddff2f13647bffe32804a0a1b9d257f0d97
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 4 17:51:06 2012 +0100

    macosx: fixed resizing issue, which was in part fixed by the previous commit by accident (close #6203)
    (cherry picked from commit f56aba45d9d053e74ff35c1aa877c4326391753a)

commit 15afdc9e7b6897cba806f4db296f2dbf46212214
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Mar 4 16:24:56 2012 +0100

    macosx: fix crash when audio effects panel was opened
    
    close #6252
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 73741d0175775e35447000b3b30f7e7f799d523b)

commit ddf35356d3c342c697e80f84cc3b220b6abc3c9b
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Mar 4 12:41:33 2012 +0100

    macosx vout: show complete window if we would resize beyond screen bounds
    
    Make sure that if we would resize beyond the screen we set the origin values to ensure that the complete window is visible.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 06f57d2bd7dd633d1ba731107b7cfc7048fc7e03)

commit 11743cc8707ccaf3525000fc40f5cdecb542da30
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 4 13:08:11 2012 +0100

    macosx: allow the user to hide the sidebar (close #6088)
    (cherry picked from commit 8f813fc43ae83fa0d04d591a1f3c6b02b1d288e5)

commit a0b2de736cbc7dd2ea8b211d07d2ed04bacea9d0
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Mar 4 12:42:00 2012 +0100

    src: fixed multicast reception on OS X when using the 10.7 SDK (close #6104)
    (cherry picked from commit 84dc949e138f6231ba0c58572b7949ca4e5724a8)

commit 8a99cd630145699e933aaa49ef40ec0bf415aef6
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Mar 2 18:44:35 2012 +0200

    Avoid char conversion in strchr() - fixes #6266
    
    (cherry picked from commit d843a2fc47bf6b9f4277310736b25caee8309ee7)

commit f4aaab56c3a2148c0d375f19f817d87a8ff0fd1e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Mar 4 02:17:53 2012 +0100

    macosx: fix white fullscreen when video ended(close #6288)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit be40ef554ab4d76d5ff221567940d0d4d5e3aa65)

commit d0db21619210659778c5ffe0484fe59deeaa7737
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 3 20:50:16 2012 +0200

    ALSA news

commit deca09e37d9fbdab10625dc91f3c4d9a14dc312d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 3 16:39:26 2012 +0200

    ALSA: add configuration item for channels, remove broken autodetection
    
    There is no reliable way to determine the channel configuration of a
    certain ALSA device. The ALSA operates at too low level for that.
    So add a configuration option with default to stereo (as in previous
    VLC versions). However, the user will not need to re-enable 5.1 every
    time.
    
    This commit also removes all the fancy device choices. The static
    choices are overriden dynamically by the UI anyway. So the only use of
    the list was in vlc --help.
    (cherry picked from commit 119c3fc9f9cc1c05df23728a6e16ac9c702e93f2)

commit c9a595bc07b974970f3a3da5427cee20e4de9082
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 3 19:11:44 2012 +0200

    Add shorthands for audio channel maps
    
    (cherry picked from commit 75977c876f7169e6e3da5605d86d78706bbfd130)

commit fef5548a606c4061b818d2411e4fb42ff412b46a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Mar 3 20:00:44 2012 +0200

    ALSA: fix S/PDIF output (hopefully)
    
    Do not clobber the output format channels to stereo. This would break
    the VLC filtering pipeline.
    (cherry picked from commit ea6e934aedda48cc024c4554cd33542ee83ab8e4)

commit d205a7890f815e3d555d7d5cadadb66ed3300b18
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Mar 3 17:01:08 2012 +0100

    macosx: fix crash on exit in concunction with InputEvent
    
    For each input thread the callback for "intf-event" was registered
    at least twice, and never deleted correctly.
    Therefore this patch makes sure that we add the callback only once,
    and also properly delete the old one when the input changed.
    
    should close #6207, refs #6252
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 53f6bc016209b67a56c2bbecf03ae05c42b7f5ed)

commit 7a5c65895f02d7fe127a64608677de716f0d8f55
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Mar 3 13:02:36 2012 +0100

    macosx_vout: implemented a cleaner approach to limit the window size according to the screen it is displayed on (close #5875)
    (cherry picked from commit 68a4652d102431c548b700d89d04c6f567d245c6)

commit 11804d91332d7de65f8ed02bbfd21ae3a9ed486c
Author: KO Myung-Hun <komh@chollian.net>
Date:   Fri Feb 3 01:06:33 2012 +0900

    Include sys/types.h for ssize_t on OS/2
    
    This fixes the following error,
    
    In file included from ../../../include/vlc_stream.h:27,
                     from ../../../include/vlc_demux.h:33,
                     from mkv.hpp:55,
                     from demux.hpp:28,
                     from virtual_segment.cpp:27:
    ../../../include/vlc_block.h:138: error: 'ssize_t' has not been declared
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 248812582798e57d8da527095fe29d4b3df75ad4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 79ebe503216e0cf762f24d02e86b052bf087fd36
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Thu Feb 2 14:03:09 2012 +0900

    KVA: Add VMAN-backend supports
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 775a33e104ef7561962bc1fb3e2c7a93c53779bb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f0d71e071fd0ac8b591b4f48dce2dc2abe867b0d
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Thu Feb 2 14:03:08 2012 +0900

    KVA: Add VLC_CODEC_RGB32 supports
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 31bec657c7f944aa1798688f10df3177c0a804d9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2dcf4b2005dbad33e6cd2763afa385b1fb8e44ff
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Tue Jan 10 21:07:05 2012 +0900

    Determine psz_vlcpath in according to a location of DLL not the executable on OS/2
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6e37e1988276bcd8e24cd71046ec55172063700b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0c74488edd5f5272410e30af7fd83b152f85b0cb
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Tue Dec 20 20:29:47 2011 +0900

    Do not use libdvdnav's read ahead cache on OS/2.
    
    Using it causes libdvdnav to complain about 'demux error'.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit bdf3c466d2212343667f5cda1bce3938d17471cd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8dfbe61b2a1d5b5cf767b919429310c283d1805c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 2 02:23:41 2012 +0100

    Support qcp file opening
    
    Close #6291
    (cherry picked from commit b6f678aa0fabb3e240f54457271c69c44e8ce0bd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4db70cd27a5ad40b3d4af36f41fa73920f744b8d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Mar 2 14:59:29 2012 +0100

    Update NEWS, once again

commit 13aa3fe403ae5592a636eae9fb248bf568d0f22c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Mar 2 12:51:23 2012 +0100

    Revert "macosx: don't let the video window get larger than the screen it is on (close #5875)"
    
    This reverts commit 60296be1e97153dfa68cda49aeac8cebf95ffdb1.

commit 4ca768b0f5b29b88e5738d3a6fb41612f13f20b7
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Fri Mar 2 10:42:37 2012 +0100

    mention SAP fix in NEWS

commit 252dba478dbb54bd1fd02d77ce873224b7f5d720
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Thu Mar 1 13:32:37 2012 +0100

    SAP : uniquely identify a session with the hash id and source, as described in rfc2974
    (cherry picked from commit c495d676f112fa09f12dcfddc6b1f2f38d3032d9)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit e64fdefd73d4bfb53bfc5da9537e4b12fc2edfa0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 28 03:37:42 2012 +0100

    Qt: fix navigation menu rebuilding
    
    Close #6219
    (cherry picked from commit fd7e3ccc211703d018d454625a37a1ca662b7b15)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f188888ce8cb40a507d86efd7751077e1d2cd4f5
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 28 02:24:12 2012 +0100

    Qt: menu simplification
    (cherry picked from commit 3f5029f86312e70edb86252dabcaae3ba6a71cc5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f61ba3e23bbf4836af78c8d9d791094b64093274
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 28 01:13:09 2012 +0100

    Qt: remove unneeded includes
    (cherry picked from commit e837f1cf0577a960450b2955809cc458ab164d20)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6fd13981389405c724be39111e50e639eb612a3e
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Mar 2 01:28:41 2012 +0100

    Qt: preferences_widgets: fix vtable entries for show()/hide()
    (cherry picked from commit d73cc541acbf2ba3067ea76aaedf61b7742a01a0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 401563f8391b946ec46597be8ba207fe1cc1daf4
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Mar 2 00:50:50 2012 +0100

    Qt: qmenuview: fix macro usage
    (cherry picked from commit 2d2c0ffaa99f2146c643e50aa1c82fdaa8a7adad)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 47ec4cecd6ccb68cf358d5bf54143a23ab55a2ff
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Mar 1 19:06:20 2012 +0200

    Work around automake bug (?) to distribute contribs
    
    Files were copied to contrib/src/src instead of contrib/src...
    (cherry picked from commit 49399c2720db101476aed2014c58444929357e19)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ab5a8007a2d802a5c1d31f7af396ae3e8ded2bf7
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 29 17:32:16 2012 -0500

    Remove unused PLUGINS variable
    (cherry picked from commit 91df5145e02822572c0fcc8f341b371c34817890)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5b7c3385a32f6c56062eda9c8bbad4dccc5ab0ca
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 1 10:40:46 2012 +0100

    Add Keywords to the vlc.desktop file
    
    Close #6275
    Close LP:943014
    (cherry picked from commit 2eba8b99b7b7b5c64041d374718ce3d7ff17a0b8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 60296be1e97153dfa68cda49aeac8cebf95ffdb1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 1 19:42:10 2012 +0100

    macosx: don't let the video window get larger than the screen it is on (close #5875)
    (cherry picked from commit 93b211422cf7fa0c7e61c355da2068e7e0e56a69)

commit 6f30aac6f5333ac40f3bd45f585c0eab0a3d8deb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 1 19:05:21 2012 +0100

    macosx: don't allow option-click on the playlist button in case a video is playing
    (cherry picked from commit e6f14b002b2232794d9dfc4a2841d2ea1df2241f)

commit dbc2db4a36f99ac8bda0e5ea4323f499c29c65a6
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 1 19:01:50 2012 +0100

    macosx: hide the playlist without option click when showing the video in a separate window (refs #6213)
    (cherry picked from commit 566b0cd4405f9c9022789ce43c86ec5ee4753acf)

commit 71b8028859926d6293e1390028033e68b47b6685
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 1 19:00:16 2012 +0100

    macosx: fixed a crash
    (cherry picked from commit aff835014cd769596220b56248fecda8bf196f29)

commit 90172d0239773fd275e4c3cfb897d6d504a3ba4e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 1 17:46:09 2012 +0100

    macosx: cosmetics
    (cherry picked from commit 1e952e5ee6cfd2e0479a6589802234c46e65d2f0)

commit cfd8b9da06ac2e2133f8cd471eb519c852792d72
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Mar 1 17:24:19 2012 +0100

    macosx: fixed track synchronization panel (close #6233)
    (cherry picked from commit 5d6ac80bae137c6b36730a4fe82841ef3eec0099)

commit d72cab6583b67dfa6ecdd4f92053cd3210dc7aa8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Mar 1 11:12:20 2012 +0100

    Gradfun: do not crash on exit on Win32
    
    vlc_memalign data should be vlc_free'd
    
    Close #6114 #6280
    (cherry picked from commit 35d2292855c399fcbcc5ef6116580db2350060f7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5d8f52cd0d4cc169de4da52c0ee0193e218b24c4
Author: Sam Hocevar <sam@hocevar.net>
Date:   Sun Oct 17 19:28:56 2010 +0200

    Fix a typo in the fourcc definition list affecting I444.
    (cherry picked from commit 8e34ab46a299beaf465db2913588e08748365751)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 87802f4c3a9ca221f4e2fbc822cd9968dab68d9c
Author: Maciej Blizinski <maciej@opencsw.org>
Date:   Wed Feb 29 15:59:46 2012 +0100

    Escape double quotes when creating 'compile'
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 96f3458656bbb207ffe0d15678ca96ae38c8f5d9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b62231db741c2d9d2c76610f4c37f5a4b63ef0ae
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Wed Feb 29 18:22:57 2012 +0400

    Contribs: vpx: fix typo.
    (cherry picked from commit 68e67843a4a37100f24f38167c89c427dcdf7986)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 56e5996142a7f20ebdf5e2277ded797ba7e164db
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 9 00:07:16 2012 +0100

    Contribs: add an option to optimize a bit for the size
    
    Notably for libavcodec
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 55295e3dcef97dc06659a58aeb7cf97022e92dfb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9be9a1f92ef1cdc6297bf8d642e3139548bb653e
Author: Claudio Ortelli <claudio@jamendo.com>
Date:   Wed Feb 29 16:16:07 2012 +0100

    Jamendo selected charts by genre
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit cdf21929f60f8fe692253ce0689b112f459bdd58)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 385994ad5bc3032d12150155e02bdf003665148b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Feb 27 16:18:02 2012 +0100

    hls: Removing useless test.
    (cherry picked from commit 39ef23e2ce0e54c074490eda0dcee6068c77091e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 77a6b5740c378a8e09a2ad417a5e11dff5ea8d83
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 28 23:40:27 2012 +0100

    Qt: remember correctly the network list
    (cherry picked from commit cba6de799bbe8583a88e00a71a277210a0b2acce)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1591fb9fe0716936704f259524221a793fd03def
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Tue Feb 28 10:32:07 2012 +0900

    Fix memory leak in video_output on Mac OS X (close #6267)
    
    huge numbers of memory leaks happens because subpictures are not deleted.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 06430f7c2468d5f8004bad8c7ff146d5a1dcebbb)

commit 8cbe58b24ae4db95c54470470e036345de934c2d
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Feb 28 18:28:09 2012 +0200

    Fix inverted shell negation "! test" -> "test !"
    
    (cherry picked from commit 3e48c330dccfb4d90e0b3d97308038b6de3b570b)
    
    Conflicts:
    
    	configure.ac

commit 70d74b7f1a9a425fe6fb07245d2b7ad6786d25ee
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Feb 28 18:28:47 2012 +0200

    Revert "Fix v4l2 build failure on Debian/kfreebsd"
    
    This reverts commit 7711eb75851df0dfcacecab5199bec5cff528ce8.
    This makes no sense as control types are _not_ macros.
    (cherry picked from commit 74ba8ca7521d0dd984db899b7517e89a8737bc8d)

commit 0faef3eeba4e99a00b0773dc896e4533d4e6d94a
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Feb 28 20:01:42 2012 +0200

    Correct default code page for modern greek

commit f692f4564795d2b5761bd168e70abbfcb3390377
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 28 15:26:07 2012 +0100

    macosx vout: reliably set the window level
    
    setLevel: seems to be not thread-safe, therefore we set this on the main thread to ensure its functionality
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit e33b79f2f7d90dedae32adad27e4c452a8ec278a)

commit 52b50d0c438e6aa78465a1b0361807985d6d861a
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 28 15:26:05 2012 +0100

    macosx: close the right window when pressing Cmd+W
    
    For nonembedded mode, this makes sure that:
    - playlist window can be closed and video continues playing
    - video will be stopped when closing video window with Cmd+W
    
    Close #6239
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit cf461cc05b82b45499f368f1a19944e6051fc91b)

commit 6fbdbb6d71d89eb71e1efc8797366a66dbe246a1
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 28 15:26:06 2012 +0100

    macosx: the window should not be always the main window
    
    With this patch, the window has the proper inactive state when another window is in foreground
    
    Close #6016
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 6e78f7b4d206c2d76b2d09e953383f0150cd051f)

commit 4763ec5a84a014315fb1986bb69a9220424a3a3a
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Dec 18 16:53:11 2011 -0500

    windows package: name win64 installer vlc-$version-win64.exe
    (cherry picked from commit 407c1ad8ffe2ed50441f91f4a0b23b558bbafcae)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 44af4993e740e54324d9418760feac6a92c7c147
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Dec 17 15:35:03 2011 -0500

    win64 package: use -win64 version string
    (cherry picked from commit 9373df563139acb2e8d2af6f531c0baaf5a08aa9)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 61b04d6538bdbca8f641074dd4ccdf7e757c228f
Author: Denis Charmet <typx@dinauz.org>
Date:   Tue Feb 28 00:22:14 2012 +0100

    MKV: Handle file with no duration or 0 duration
    
    Close #6137
    Fixes issue in http://forum.videolan.org/viewtopic.php?f=14&t=98525
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 3c5f2a8ccadc870bbce6c58ac6f292886f4899dd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bc900dc207ddcef08ed04f5bcbed26cb95468c37
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Feb 27 21:40:18 2012 +0100

    macosx: don't show the playlist on stop in minimized mode (refs #6213)
    (cherry picked from commit 23d755550b26259906b9d36443f20c0e2f3f1b56)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 932a9415eae7f5533600784696a9a4a88770486e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Feb 27 21:10:37 2012 +0100

    freetype: changed the default font for OS X to 'Arial Unicode' (close #6087)
    
    This appears to be the only sane font installed by default which supports at least Latin, Arabic, Traditional Chinese, Simplified Chinese, Japanese, Korean, Cyrillic, Vietnamese, Hebrew, Devanagari, Gujarati, Urdu, Tamil, Thai and Telugu
    (cherry picked from commit ee647c11403dbf64805f4e88e093114be59dea2a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 63a372248d3c4099739442f57031e4999941a8c9
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Fri Feb 24 12:54:33 2012 -0500

    macosx: Really use specified SDK in build.sh
    
    Sets the SDK in addition to minimum deployment target.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f89d9b2f571c7cff7ce63881ce575090dffb8fbd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d9f8281b6004cc469cd03f558cceee59a29f678f
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Feb 27 14:21:47 2012 -0500

    osx packaging: fix typo when creating include directory
    (cherry picked from commit 62a6fc50d6c2559adb28c238d18729a70525809b)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit c1962ff4cfb700c16a24c8db86ead9d0a596e026
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Feb 7 16:09:10 2012 -0500

    dxva2: compatibility with mingw-w64 trunk
    
    Includes initguid.h and use existing DEFINE_GUID
    Add MS_GUID for GUIDs that should be declared only if missing from dxva2api.h
    (really, those should move to videolan's dxva2api.h)
    Move DXVA_NoEncrypt away from codec GUIDs
    Sort the GUIDs by codec, align properly
    (cherry picked from commit 63eb4c52339106983ab8ce5e3f6f5f982dcae3f4)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 0a818b7758cf40b36835898f86b6f8a85cda1336
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Feb 6 16:19:09 2012 -0500

    DXVA2_ModeVC1_D2010 is specified by Microsoft
    (cherry picked from commit 08973b65ec3b7dab6f316454105fa53b345cb015)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit e062560a0eae5d523f09d3b2ab130a1b87670863
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Feb 6 01:22:43 2012 -0500

    dxva2: sort Microsoft and extension GUIDs
    (cherry picked from commit b2ded57a1525cb0c0b7a6a07808b07942899564d)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit d8f60bdb66f0ee8b164b80d57d24afc7fde69c93
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Feb 6 01:04:48 2012 -0500

    dxva2: don't define unused values
    
    define DXVA2_E_NEW_VIDEO_DEVICE only if not defined already
    (cherry picked from commit 454ef7c42ffc7ad1626fa9d2acba7064ec76b466)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 6142c9f267528116beb447db063220138273b817
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Feb 5 16:48:20 2012 -0500

    dxva2: remove useless stub
    (cherry picked from commit a9060f358fd6e1b44d74b42c50e515a04ea6749b)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit ad2270036bad07ecf6be3685ef6d95e73afcb8ee
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Feb 3 18:54:38 2012 -0500

    dxva2: workaround broken definition in mingw-w64 header
    (cherry picked from commit 9dc8b9bc27270752415d1fbc9629d9d35a6d8251)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit b2999095a64a16b1857797cb7433f7a4bc1209bd
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 1 15:49:19 2012 -0500

    dxva2: fix print format
    
    DWORD is unsigned long, not int
    http://msdn.microsoft.com/en-us/library/cc230318(v=prot.10).aspx
    (cherry picked from commit cb1fe28ba2f6ebf237e8988f1bcfb10e1d1c3162)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit c2c2300b06b4689301353f31d84eb1c7c803a2fb
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Dec 7 11:20:40 2011 -0500

    Dxva2 is only available in Windows Vista and above
    
    Define _WIN32_WINNT to 0x600 when checking/using dxva2 headers
    Continue to use a lower version to retain XP compatibility for the rest of VLC
    (cherry picked from commit 87038073b8434addc0d360d98a55b67fd55352a7)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 1b37b0ce30b053c34725d6e8b265c676da55f8b2
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Feb 3 13:59:06 2012 -0500

    bdagraph: build with mingw-w64
    
    use _snwprintf instead of unsafe wsprintfW
    define NO_DSHOW_STRSAFE to not ask for secure replacements
    remove now meaningless very old mingw.org workarounds
    (cherry picked from commit bb7509af051d8384b9266bcdb345c553f608559c)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit d6182ce2afb185e667e42fcfaafe2b8695a7ccc8
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Feb 3 14:09:33 2012 -0500

    dshow: build with mingw-w64
    
    remove now meaningless very old mingw.org workarounds
    (cherry picked from commit 56b0211298cd7c8fda123ce171ec728e295ae9ca)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 817deca0b755529cf872ff84f9f82d7af2f04807
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Feb 2 14:01:56 2012 -0500

    dshow: remove non standard extensions from header
    (cherry picked from commit 33c9aab4012f2141f3b40438475f0fae79c338b1)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 0a1ecaa736217750d6f15b008befef62ce294294
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Nov 28 21:59:12 2011 -0500

    (v)asprintf: define HAVE_(V)ASPRINTF if found
    (cherry picked from commit e982db92e1cf61970d7057c7f651c6f07d17d2b2)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit e9ebc6b2c4f3741333f5bc8c58b0e0e041dd22fa
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Nov 28 21:34:47 2011 -0500

    (v)asprintf : don't use AC_REPLACE_FUNCS
    
    Use our own check which also recognizes static inline functions
    (cherry picked from commit 84a1a3461adf901ff134a09eb4341cc301fdc6dd)
    
    Conflicts:
    
    	configure.ac

commit 8c486142a02e6c4e33195db4cba6e42313291360
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Mon Feb 27 13:19:53 2012 +0100

    update NEWS

commit 3690b371288b5fb0c3f1a66a32753778b7a8beb6
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Tue Feb 21 12:56:56 2012 +0100

    dereference p_libvlc->p_vlm after the media clean up
    (cherry picked from commit 88e497880b252bc2a73b8e14cd9b6c5ddc13bc77)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit fcd42e663464458cf64d09abbea108e231f362e4
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Fri Feb 24 15:28:28 2012 +0100

    avformat : fix overflow in timestamp computation
    (cherry picked from commit b19614ae62c2083ae7f5b34cd7b7a5d3ca7e250a)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 92c1262a82998e8263093b28ccba5751fa6c4e7b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 26 22:55:32 2012 +0100

    macosx: slow down the forward/backward buttons a bit (close #6135)
    
    continous button action skips 1 minute within 5 secs now, which matches iTunes
    
    note that iTunes gets faster if you press the button longer, which is something we might want to do as well
    (cherry picked from commit 86572c9fec46e3f4ea530e0ed1f0471eed66c735)

commit 76d16893cfb15a604b9a9ebc64147054aaf030d1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 26 20:09:54 2012 +0100

    macosx: fixed a logic problem which prevent the proper exit off the fullscreen mode when using the 64bit linked against the 10.7 SDK on 10.6 (close #6157)
    (cherry picked from commit 4e7ebf8df7f57dafa2a9e4ad1486cc4908aa4e6f)

commit 01887047253b7d87db739d820c6a03b7ccaaa63d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 26 19:50:21 2012 +0100

    macosx: fixed another manifestation of the progress bar flickering (close #6212)
    (cherry picked from commit 14e37593db2c700f2235b62f5995f73323029bfe)

commit 099dd0e6800c93b66dd547bc00dc4c12c8177a62
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Feb 26 19:46:12 2012 +0100

    Update NEWS for 2.0.1

commit c10f9d2fd9e213bcf750b8fdb327da8005dacf3b
Author: Benjamin Drung <bdrung@debian.org>
Date:   Sun Feb 26 18:22:40 2012 +0100

    Fix v4l2 build failure on Debian/kfreebsd
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7711eb75851df0dfcacecab5199bec5cff528ce8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9103ca5e973643a4e662e70bf90714e12dde9f54
Author: Benjamin Drung <bdrung@debian.org>
Date:   Sun Feb 26 18:18:14 2012 +0100

    Add missing CFLAGS_* variables for altivec
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9f75ee35a0887211b440f00dd32640c878f91406)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4ee0b539c7bf58be9e5b70d378e662d6b9747120
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Sat Feb 25 20:28:00 2012 +0100

    Qt: preferences: expand root level.
    
    We have only 5 items, and lots of empty space.
    Let's save the user 1 click and give him a better overall view
    of categories.
    (cherry picked from commit b2cfa07fb0899f5b9370e8dd4792108474071024)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 34519a21110a3d31a862c374098b4db0fc095269
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Sun Feb 26 17:38:09 2012 +0100

    dbus: Do not crash on method calls with a null interface
    (cherry picked from commit 735e0dac1990eb9ba7f1882ee2d0ad40739e1d68)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4567283d38c7ae7a8079baac6946ca1f87a60446
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 18:14:26 2012 +0100

    MacOS: fix typo
    (cherry picked from commit fc325e6308a059099d6239e829fe5b59ecdc821b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 304bd1e5455aaf30a8e148cdaadb388d3e5155b0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 18:07:52 2012 +0100

    Qt: increase the granularity of the spatializer module
    (cherry picked from commit eed192a415b396e36476cd9e8915c604d8ea9d40)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9876190294eddab69d41b9407666bd9ef57fe14a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 17:55:36 2012 +0100

    Qt: bigger spatializer UI font
    (cherry picked from commit 1e0af725d89abacc5b4cbe15f986960fca22727a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e7dccc29aa8d1928d93cf20a8330b4c86149cf83
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 17:54:25 2012 +0100

    Qt: adapt the spatializer GUI to the new values
    (cherry picked from commit 50bf4ecba24e13d8453a02573d23589e40e28853)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e8ad8716e8599c8e58ec4d4d742f64cf9f257bd4
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 17:49:34 2012 +0100

    Spatializer: limit damp range
    
    Close #6143
    (cherry picked from commit e15926296fabd591fe61ffb22db1df93e62fbd49)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ef362a28573893a91c88f23215126ef83b4fa11f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 17:18:39 2012 +0100

    Contribs: update UPNP to 1.6.15
    (cherry picked from commit 3a5086c835092aa42de3aa9a43b688fd85a11e10)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c10c800cec603d0b7fc0a85ff34e41965bd9b3c5
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 17:15:21 2012 +0100

    Contribs: update Kate
    (cherry picked from commit 2e7a7da283b75d6d6f4ebd6876669a486cd48f9e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8186651261da673bb65682812d96cb716ae24923
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 16:54:00 2012 +0100

    Update GLEW to 1.7.0
    (cherry picked from commit 1966f8932b0f4f30bfbbb2abf7e89f0fdda058cb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8e354a8cc332537d068221fefd8e8604e5a1ada7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 13:50:30 2012 +0100

    Add mp2a fourCC for some Mpeg Audio
    (cherry picked from commit 18d3b9242b823db84c6d782d1fad03def223a5e8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cbae861e6572109f15d933b2f8d87e8ce481a8d5
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sat Feb 25 11:25:29 2012 +0200

    avcodec: Allow encoding standard stricted to be from -2 to 2
    
    Should fix #6184 as aac encoding seems to require --sout-ffmpeg-strict=-2
    (cherry picked from commit a64b15e7be6f8dd3107245802d884baa5a8cf276)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b181505deb1ff0df7818dc9b7d0f4aeae8bdc3b1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 00:25:01 2012 +0100

    Contribs: update SDL to 1.2.15
    (cherry picked from commit 1ff2b3fb2c0772f176a519858cee438d134071d1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 255f40347e05398e6f6b2d93c602ffc85a9887c8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 00:21:32 2012 +0100

    Contribs: update SDLimage to 1.2.12
    (cherry picked from commit eb7207e8e65933b7574d0f21b608e7be3639e450)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 901160d0e51720ac3b8d26345af7eab116aab33e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 00:19:01 2012 +0100

    Contribs: Update libjpeg to 8d
    (cherry picked from commit a3a75048a6ce1e3509101136de70132d8a9ccae9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 21c91469433938fabb79279d549e99abff828513
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 00:13:29 2012 +0100

    Contribs: Upgrade schroendinger to 1.0.11
    (cherry picked from commit 72c35564542f44a42c3c977ddeb99864bde6839b)
    (cherry picked from commit 9457b4e1444438a7953bdb75567f2b7051db422d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4b913a4e1cb40636a013bab6e78703d2c642f6f9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 25 00:09:35 2012 +0100

    Contribs: update lame to 3.99.4
    (cherry picked from commit 12827fd6582cbed575da738716cc953c1ee3c26e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0d6b80ffdf58a5d0a817d44bc6d855d90ce806ab
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 24 18:12:10 2012 +0100

    macosx: removed tabs and fixed whitespacing errors
    (cherry picked from commit cff6fc15e4ddc8e31ddd2d7584c7d96ff74c19b0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ff3721031797e7440741b811ba645afd23761c7f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 24 16:55:51 2012 +0100

    macosx: work-around a crash when deleting an entire playlist root
    (cherry picked from commit 58052ea41383cbd3fa362b24318d529f44797004)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7323dd8a1f9ad8b7e6edb11efdce58d4b882af26
Author: Denis Charmet <typx@dinauz.org>
Date:   Fri Feb 24 00:07:00 2012 +0100

    Use mkv track flags to define the priority of ES
    
    Fix #6199
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a2790164362bddf5e18c1d0e577e5c7787cc1be6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2c54f12284de95465ec3b1b933bfefb838edb0cc
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 21:48:19 2012 +0100

    Mention RAR fix in NEWS

commit 6d12ed2f7ce04f8e0513821ae7d1266c0363d866
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Feb 23 20:13:39 2012 +0100

    Fixed support for multi-volume archive.
    
    09d1c6e1891cdc914d25279aabdd83c13baab227 was not working...
    
    It fixes #6190.
    (cherry picked from commit 1cc7a5c9a45e1d1b54afb310f68e43cdec32dc6f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2991efd0379c5495d8f48db85d18372afdda70d8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 23 19:40:53 2012 +0100

    macosx: restore 10.5 compatibility
    (cherry picked from commit 1c23e3df85cc362066087ec8727c117dbc19f6e8)

commit d72b9383fed5a39fec3c237e6b4db23c67fef4e9
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Feb 23 18:47:45 2012 +0100

    macosx: proper use of presenation options, removal of an redundant if
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 5e732fcf3bb9758c8d78f03d9089a7f9be5949e9)

commit 468dc433b0d118fb9262f0a64528019036238529
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Feb 23 18:47:44 2012 +0100

    macosx: proper gui update when toogle mute state
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 53dfe2b3a26c1f6ae97ab466fa2c871896e7258d)

commit 05fa61b358c5eceb94bb308c38e94d74c603cbc8
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Feb 23 18:47:43 2012 +0100

    macosx: fixed a warning about missing [super dealloc]
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 1e042a44f2de641d33742af1c1d706d01db6e69e)

commit 77bcce1ef1ac4627fa632825fa3718081117f3a1
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jan 4 21:10:50 2012 +0200

    Do not use the monotonic clock if CS is missing
    
    This can happen on some POSIX.2001 systems.
    (cherry picked from commit 46f74073685b29544dd55b3494f82e77fe9b4b6b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2fdfed843805d398a2e4a59a78777f3288fdf814
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 23 19:10:41 2012 +0100

    macosx: fixed compilation when using the 10.5 or 10.6 SDK
    (cherry picked from commit 2619d2f6a9d2fb47712a01066b7d49aefd6b874b)

commit 8fc7ab9e479a78416a723542cc2c3c55f5da61e3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 18:33:14 2012 +0100

    HTTP interface: more extensions recognized
    (cherry picked from commit 66fd094d138267f03033f0220cb7188940fc6fc9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 99dffe66e0b10172e3d4437791be99ab993a173f
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Feb 23 18:16:30 2012 +0100

    hls: Fixing a memory leak.
    (cherry picked from commit 3844c07d1036d0e769c03327102ce30c89aafd4d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58f42e28c5b23adf08863ec14f74d43783ee8768
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 17:59:49 2012 +0100

    AVcodec: limit the number of auto-detected threads to 4 by default
    
    Revert this when you have found the reason why it fails for soo many
    people, in avi, mp4 (and mkv before the HACK)
    (cherry picked from commit ce85748bd0dcc074d69c71d51ead53968eebeb9e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 095c9ba8e46233b368bb25e6fdb4a7fa2b207088
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Tue Oct 11 16:16:56 2011 +0200

    qt4: fix logo selection dialog box not working right away
    
    This patch ensures that, as soon as the user comes back from the filename selection dialog box, the filter is updated accordingly and the expected result (logo insertion or deletion) can be seen right away.
    (cherry picked from commit 8fc17f107d6dc63f88cbb6f56279732b0c5d5079)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ed18e965edb247b9704b44a06f2f9211c8a0d950
Author: Adrian Yanes <devel@ayanes.com>
Date:   Thu Feb 23 16:12:49 2012 +0100

    Qt: menu additional fixes for more video options
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a7ead0dcf11d97dd8d68dcaba9caeaa10db92555)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 20d7b36889d05b60f3d9f4e1ff13d401f2e74f8e
Author: Adrian Yanes <devel@ayanes.com>
Date:   Thu Feb 23 15:19:07 2012 +0100

    Qt: fix macro RADIO_OR_COMMAND
    
    Commit d858c4 introduces a new macro that is chosen to evaluate if an
    element in submenus should be an ITEM_NORMAL or ITEM_RADIO
    based on VLC_VAR_ISCOMMAND flag. The conditional results were in
    the wrong order.
    
    Close: #6149 #6197
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 3feeb95479ff7b760ecf90869e001d52a53d784d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a163141adc89e2731fe78d10047c87a806250e46
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 18:06:57 2012 +0100

    NEWS update

commit 00346bb20e8756d20ca6c8c43fdea813acbc03d1
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Tue Oct 4 00:14:52 2011 +0200

    skins2: add $R to display current playback speed
    (cherry picked from commit 5c277fc5b8565308e70b88032d7a843c6df19fac)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a0ebcbbdc36eb15c74c9ed140ff0474881fc43d3
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 23 16:35:52 2012 +0100

    macosx: really fixed the time line drawing artifacts (close #6057)
    (cherry picked from commit 55a47406fd1391b61b85b2051951434741e299a9)

commit 3375d10974a45215e0e9a9aef2edc07ad9793040
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 23 15:51:32 2012 +0100

    macosx: don't give the user a chance to push the play/pause button when targetting the forward/backward buttons
    (cherry picked from commit 67c68a718757f769f896b41115f71c8b1acc902a)

commit cc8434cdd39018e990ea800a91e9d992eaf0190b
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Thu Feb 23 12:18:09 2012 +0100

    skins2(doc): update doc to introduce $R (speed rate)
    (cherry picked from commit 2d01ee6534d75b5a2b6a5572eca59db7d7babb48)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d3050f7ce8bbc36a45210f44b017ce4f1f7258e3
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Mon Nov 22 17:28:32 2010 +0100

    skins2(doc): update doc with new vlc2.0 features
    (cherry picked from commit 4154e4963a7d91e44545d1408fb5c11708fd1039)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7574dc547d03c746595d55098e6b6172b7556269
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Feb 23 12:15:46 2012 +0100

    mkv: fix seek crash on osx
    
    Close #6178
    (cherry picked from commit 64ffbe934c7e3bd6452ef97062e3cd49f31e3e06)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d96e19a290006fa1c2b9f91c91cad8bae20c3589
Author: Jeroen Ost <jeroen.ost@gmail.com>
Date:   Wed Feb 22 21:32:08 2012 +0100

    Fix http live streaming without bandwith set (optional according to spec)
    
    This patch fixes Apple Http Live Streaming of a single stream without bandwith set.
    According to the draft RFC, the bandwith parameter is optional. VLC treats this as bandwith zero but
    estimates the bandwith based on time it takes to download segments to be able to seek accurately. When
    the playlist is updated for a live m3u8, the bandwith value of 0 will cause a new version of the playlist
    to be created - effectively stalling the playing stream. This patch makes sure that playlists that do not
    specify bandwith reference the same instance.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 0b54d2cb5ead026c158556fafc9fea75e8b640f5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 17e890422a48e44a68d5ae26dd5337b3d82f835d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 13:16:25 2012 +0100

    Qt: reinstate ticks under speed slider
    (cherry picked from commit 863692af6914187afd09eba7f84c6e95361ab38f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 94cbfb9a8c54aa6fe34389a3e805d5f20810d046
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 23 12:55:20 2012 +0100

    enhance Mac NEWS

commit 40c9dcb28a7f8a132144d183453ea42dcbb220ca
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 19:36:47 2012 +0100

    DirectX: fix libvlc_audio_output_device_count
    (cherry picked from commit ff8b5ed33d6ec9fc8f2feca598f0de1c5708e9f1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1211ce02dfef78d23f84afb577934aad140ccda9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 02:04:46 2012 +0100

    Libass: improve the fontcache display
    (cherry picked from commit 615d535cd44cbb83b2d8fce3a0eb757adf88f3e3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b20a5b6e56c55796684a78645a7882dadf69ca1e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 23 01:59:31 2012 +0100

    Qt: fix progressBar timer
    (cherry picked from commit 41669761ffdac7d0efb927bd7c51f3494fb7d7cd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5a8bfcc470105ffb3500c6a4d263ed6c6eaed01d
Author: Julien Humbert <julroy67@gmail.com>
Date:   Fri Feb 17 16:35:34 2012 +0100

    Add .3ga audio extension
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7bc86920dd50e19e9fd71fbf85a1658449e5acc2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 652a08b3d1625da0f5019e248f9ceb18dc74e40b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 12:21:27 2012 +0100

    French translation: remove religious symbols

commit 09074faa447c03282813c09df1f383fbd7b199d5
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 12:07:26 2012 +0100

    NEWS for 2.0.1

commit 867bb1fd97cfa00127b148142aa5213b85f86803
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Nov 28 21:55:35 2011 -0500

    fix access_smb libraries
    (cherry picked from commit 718b1f9901e5077b50c2189604afba883ca87bf7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8fb1b83baf7ada496ce029da59db4f6dbc7cc594
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 01:01:30 2012 +0100

    Qt: allow people to use a native seek bar
    
    Close #6109
    (cherry picked from commit 89dd589de5ccd59ed3049a980276c6167a615afb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0b37103cb791da2af0dcb277a84e1692e8d3f983
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 00:54:43 2012 +0100

    Qt: Extend seekslider to use the old native look
    (cherry picked from commit 910b0583beb2523e5e092317c35e26d0856441f5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 844056d29438d04ca2180de310ef6fb7541a7d43
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 00:36:13 2012 +0100

    Qt: renaming variables and simple cleanups in seekslider
    (cherry picked from commit 0147fb79c23a80a3a3fbaddaa6362a5ab9d5ee9a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fafbf575e767e6514c782436efa26cb94fef42a1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 22 00:24:55 2012 +0100

    Qt: aspectratio: use the same height as other buttons
    (cherry picked from commit 8cef4081145f8dd4b3fc5cefb9ba995782a6a876)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9ec81c11bda8ccb943107487ada5af2f995cdee3
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Feb 19 09:38:43 2012 -0500

    Qt: Use RejectRole for close button
    
    Close #6085
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8d5bff61c4eb64b855a1750c729a81973a067159)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fd6840e2c53ef75341f1ea9e65da5700fc1e90a6
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 21 23:59:40 2012 +0100

    Qt: AspectRatio Box, code style
    (cherry picked from commit 956e357d52599478042bee88394d723b32a0d42d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1f78fbd6591834dc790a54ca81cacf4219fbf7a2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 21 23:58:27 2012 +0100

    Qt: missing translation in the AspectRatio Box
    (cherry picked from commit 2c5bdf7a1a0ad96bb9d405654ebbb6270e7f44a2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit abba280f0d6640bc8ea33af046d46dc641c4a6a8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 21 23:56:10 2012 +0100

    Qt: missing encoding conversion for AspectRatio box
    (cherry picked from commit 2d0b4b20ffc18581657f430293ee7e7d8cdc7270)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eca43d4862fb9a2b7b9a339563c3e5cd662b07e9
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 21 19:02:38 2012 +0100

    Dirac: Register .drc extension
    (cherry picked from commit 122e64faef977c1ab7f4b87285a1eafe85c6a84d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 345e93b0d10a81e0aba5bb6c32f740adaa33c9ec
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Tue Feb 21 16:39:58 2012 +0100

    qt4: fix the main input manager initialization.
    
    This fixes a bug reported on the forum at
    http://forum.videolan.org/viewtopic.php?f=2&t=98332
    (cherry picked from commit 0c1f7006bd6f4915d20d14a411ac1854aa5d7703)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f42f00c8e1c819ac320442402ee17feeaf4972b3
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue Feb 21 11:19:38 2012 +0400

    CDDA: Implement disc information caching.
    
    Note that CDDA module still needs to query freedb service for disc ID,
    only the track information is cached.
    (cherry picked from commit c95ed8127b7be0f57703cd5f8ed4a951212267ad)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c5ae3b36bbd642f181460fe0bb97e2f6731f3b07
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Mon Feb 20 19:41:08 2012 +0100

    Qt: plugins: close() is RejectRole
    (cherry picked from commit 17779413432c3e6bfb0233ed5fac90a5f058510b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1d1e3428ecb95543346da0f6fb54962c9770e784
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Mon Feb 20 19:36:36 2012 +0100

    Qt: plugins infos: filename is not editable
    (cherry picked from commit cd02ebb272bc389fe425c95ca203a12a8b90aa72)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit de703379762135cebcc7009812ff86f5f1584c1e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 21 20:32:49 2012 +0100

    macosx: stop the playback on when closing the main window only if there's a video inside (close #6144)
    (cherry picked from commit 4a4848c92a5d5b197853760d168c648b4d00de38)

commit 41f6ced2b0b48ee5daaa5f753bd6ff9ff662cc4f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 21 20:26:57 2012 +0100

    macosx: resizing fixes for the minimized state. additionally, make sure we restore the state last present on quit. (close #6122)
    (cherry picked from commit fa9bc462bf156c7760dc78f64e270e13129287f3)

commit f80f76424ee76796e9816726ddc276930406cdbd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 21 20:25:42 2012 +0100

    macosx: work-around so we don't block the main thread for ages during launch time without showing a window
    (cherry picked from commit b27649e51ed6f9c3f398f86276bdaf5e0960c860)

commit a69ec1feddef8ed72d634f2f820c8c3eae60a328
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 21 19:15:08 2012 +0100

    macosx: implemented option-click on playlist button to hide the playlist (refs #6122)
    (cherry picked from commit 2eda8d458b04b9d72e6c0284d80480edaf134355)

commit 5e2484703be953e0d35094eec54543a88cf91f95
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 21 17:45:23 2012 +0100

    macosx: work-around a corner case and disallow the sidebar's library item to collapse
    (cherry picked from commit 74c8629c42ef2c9bf8f96ff9caae75968f386bf5)

commit 942b3851a75c52011671ff6a6ae1c0a4dd765822
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 21 17:31:00 2012 +0100

    macosx: fixed seldom crash when collapsing stuff in the sidebar (close #6150)
    (cherry picked from commit 16932fa4caa9bab8ff56e694a9a296d1a3b05bd6)

commit d08c46d99f0aed9de4114ca72e39fbec65ab8980
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Feb 20 13:41:57 2012 +0100

    macosx: limit the screensaver blocking to video playback
    (cherry picked from commit 1bf204696fad551de5b46f7624feb66c0dfc3d34)

commit b888dfca4d7fa0272321d0171b341093595a9e7d
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Tue Feb 21 13:21:41 2012 +0100

    add mxpeg in NEWS

commit 594031e872f4e25eb0a3a1fbe6748a57906c6d8d
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Fri Feb 17 10:01:01 2012 +0100

    fix [56e7865dce2] compilation
    (cherry picked from commit 25ef7e7d6ff11b629788432a5314e72830c98248)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit cba4df235c0000fa2de179b1c50c77876baa5aeb
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Thu Feb 16 15:08:33 2012 +0100

    avformat : add an option to force a specific format
    (cherry picked from commit 56e7865dce209276279eae8d9c388c7e88737776)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 93a0dc3a802090a1168bcd1a65b95958c9ebf658
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Mon Feb 20 13:58:53 2012 +0100

    add mxg extension
    (cherry picked from commit 724284bc613404436b561e73fe4daea1e494879e)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 72d1be628329c085b9f3b1c4fc37f8139994bd8b
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Fri Feb 10 15:14:43 2012 +0100

    discard image and mjpeg demuxers in case of mxpeg
    (cherry picked from commit 2985b7fe1755b8bc3b3e7c01cb1bc4f92b770791)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit d192cba00acec14647518a0b5c81f1734bbc9bf1
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Fri Feb 10 15:14:26 2012 +0100

    Support of Mxpeg codec
    (cherry picked from commit a6fdd02e3b952dc2f66469cc4bd5e0b7ec1116f4)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 18169aa31a3d988ad029b2e6fb698fcadf8589af
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Feb 20 19:17:17 2012 +0100

    Qt: Missing .
    (cherry picked from commit d907f11b8baa3bcac6bb6f7fcae7bf6f5061b2a9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 350694ead6d27b73318b319e1475c333ed4ae930
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Mon Feb 20 17:34:36 2012 +0100

    Qt: plugins: link to addons.videolan.org.
    
    Don't expect user to guess it.
    (cherry picked from commit 02affbfe678a99fe85830dbb614e770b9c8ef78c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 70cf0848d2fcf8e14ca973e392e2533a4934c6dd
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Feb 20 19:12:02 2012 +0100

    Qt: limit the number of entries in the right click to 25
    
    Close #6103
    (cherry picked from commit 6241fbf7201744c8eafd32b660ba1156f14a758d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58958fbdcfb18ef4745ae7084ae51d488df371cd
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Mon Feb 20 16:43:42 2012 +0100

    lua http: mobile.css wasn't packaged.
    
    Please BP.
    Bug introduced by af04c6fac8c2c6eedfcb7cc54e4fd4171d9a7437
    (cherry picked from commit 1db29c8b609182c7dff28b9374bc0b4d436e7965)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e260571d8aca4329075c0f0f8cb26bc4f33c1bed
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Mon Feb 20 11:52:42 2012 +0400

    cdda: use http tunnelling mode and use port 80 for requests.
    
    Closes: #6081
    (cherry picked from commit cb2ec4710b5eaacb32714be386ad2a738aa460af)
    
    Signed-off-by: Konstantin Pavlov <thresh@videolan.org>

commit 1b9bcedf3c89a3b026ac1e189c79519873676016
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 22:39:29 2012 +0100

    macosxd 2.0.0's 1 bug: fixed redraw issue within the time slider (close #6057)
    (cherry picked from commit e7d046167a65779191a10ca4a615649874d9d03d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9ccbd8d804ea236087553d3827d56160b39b8741
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 22:20:12 2012 +0100

    macosx: fixed a crash when rebuilding the playlist view on quit
    (cherry picked from commit c7f4fdf8f42253fa17620fd357c78c953a510d72)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 690d07949cb368fc837836efe464e8ed6d8faf16
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 22:19:53 2012 +0100

    macosx: delay the 'rebuilding fontcache' dialog (close #6040)
    (cherry picked from commit 5b459832fe73699efcce93910ca4bf33d0599973)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit de8a5786ee8bc1125a8faae7713477d459a65715
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 22:02:42 2012 +0100

    macosx: make sure that the video output is displayed in case the user requests a different item from the playlist (close #6041)
    (cherry picked from commit fc9d9cca9bfb381d24aed8ec5d8b3a464cf31004)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5f7f74bb08b7016ad797d651588497dc1d56f442
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 21:36:19 2012 +0100

    macosx: default disable the native fullscreen mode on Lion since it is confusing for users with multi-screen setups
    (cherry picked from commit d3ac60b2c3e369d10bf8626856248a4567e969ed)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 19e20ad7a98b3b3cece81ec3804d3812b146bb0f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 21:35:17 2012 +0100

    macosx: fixed 2 long standing compilation warnings
    (cherry picked from commit 91457387941dd1198f03527cbc6088dde7c00988)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d6ecd346f037d3e811a73db77637b555355da3fa
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 21:30:13 2012 +0100

    macosx: compilation fix when using the 10.5 or 10.6 SDK
    (cherry picked from commit efc40549caa0e3710474dd641aa2eaf4fb179efe)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 77519bd63af9efea0e42624ba6f1c63350190a2a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 20:58:40 2012 +0100

    macosx: implemented accessibility code for the custom window buttons used in the black window style (close #6093)
    
    based upon sample code by Peter Maurer - thanks so much!
    (cherry picked from commit e93cace3b35a555a023b1adc9fcdfb8da231ec57)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit deb80d2af4396b687c1d6098007719b406f29024
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 20:40:27 2012 +0100

    macosx: implement visual feedback for volume changes (close #5837)
    
    the osd sliders don't display correctly - no idea why yet so far
    (cherry picked from commit f70cd93da07d2f421791e83101c3796f34365fbc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit efbfd1e3aaf2a7bf0d60786e8fa6b4aadd5fb6f5
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Feb 19 17:11:05 2012 +0100

    Moitié ne s'accorde jamais!

commit 91b3e9c838d9cf9bbbf442dc7078851a450fd4b1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Feb 19 04:20:29 2012 +0100

    PNG release 1.5.9 (CVE-2011-3026)
    (cherry picked from commit 41988c3288c0a0d3a298eee6740e3d4fc4cf784c)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 179b444cf4a0880d6507b27996d176ddff7b1d5a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Feb 19 04:21:50 2012 +0100

    Contribs: Update to libtiff 3.9.6
    (cherry picked from commit de0cdc779b21c9c67a65ab464e9ef909d4ba5a9a)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 986cb6be66151a46726c826a8f9d5a17fbc4ab07
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 19 13:38:40 2012 +0100

    macosx: make sure to always exit the fullscreen mode on Lion when terminating to prevent ugly artifacts on the next launch
    (cherry picked from commit 200a43b8f85c9affb427ee303bbb940ced8eb455)

commit 6ed2d4facda91923ce458d3c7d16f6ec3d41540f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 18 19:34:29 2012 +0100

    macosx: fixed the ub creation script for the new contribs
    (cherry picked from commit 34c66055d35e62d5347f03c5f06f25e1db5a576b)

commit 779e24dcad1ba1d5f7ed069a9f0d1b5c3624aada
Author: Denis Charmet <typx@dinauz.org>
Date:   Sat Feb 18 14:35:46 2012 +0100

    Fix seek in mka
    
    Fix #6078
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7098f40219523ba072997c9e86f3b2c626caddda)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3543efbf61ce76bfb1c61ec2eab41f9406771b1a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 18 13:02:42 2012 +0100

    On the road to 2.0.1

commit eeb77835065383252f0c0ceb3c5705c695633925
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 18 02:34:44 2012 +0100

    contrib: fixed OS X framework installation
    (cherry picked from commit c4f14cae3b1bab3260b933306893f8fc1acd9842)

commit 455e82f1229d400ed536d3b9ceb33e856d2db11c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 18 01:41:40 2012 +0100

    Revert "macosx: prevent unwanted strings from being displayed instead of empty strings as suggested by xtophe"
    
    This reverts commit 84eee5c2fda0508547f3f4c479d9df8162acf1d9.

commit 421a4fc5ea3652483a80980f3f389bc29eccbb1e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 17 18:43:24 2012 +0100

    Update NEWS for 2.0.0

commit 84eee5c2fda0508547f3f4c479d9df8162acf1d9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 17 18:33:36 2012 +0100

    macosx: prevent unwanted strings from being displayed instead of empty strings as suggested by xtophe
    (cherry picked from commit a97666db8a5ee0eb8498cc068c4fe3a8d76e1783)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6907cb09fb5becbf5b31b78b50b39ae7dab284f6
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 17 18:15:07 2012 +0100

    NEWS for 2.0.0

commit 1ffd6ed7e5ce5959dfbf78fc9cd3f99b29b50df9
Author: Tomáš Chvátal <scarabeus@gentoo.org>
Date:   Fri Feb 17 17:16:01 2012 +0000

    l10n: Czech update
    
    With contributions by Vít Pelčák <vit@pelcak.org>
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit e20d6b15681cb5b00f7bf77566f50d70c8d7f371
Author: Sidney Doria <ssdoria@gmail.com>
Date:   Fri Feb 17 17:03:37 2012 +0000

    l10n: Brazillian Portuguese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 107852d67a09693aeaf4bbb00665faeaf42aeba2
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Fri Feb 17 17:00:27 2012 +0000

    l10n: Japanese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 0705b1fecab2b40cb97755026bd5c271dcc38530
Author: Gonçalo Cordeiro <gzcordeiro@gmail.com>
Date:   Fri Feb 17 16:59:44 2012 +0000

    l10n: Galician update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit b7bd213599a219b8cf9a96ecc715be674350aa94
Author: Mihkel Kirjutas <turakas@gmail.com>
Date:   Fri Feb 17 16:58:12 2012 +0000

    l10n: Estonian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit c6c7223cd49e1997d8fc252df056bca74890d63c
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 17 17:53:28 2012 +0100

    Update PO

commit acf3b2974a684c8026eacafb3ca051f074bf50d3
Author: Denis Charmet <typx@dinauz.org>
Date:   Fri Feb 17 17:44:44 2012 +0100

    Avoid a crash if there are duplicated files in dir
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 934582e46d03f2acdb39b170b161856c42db61b7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3ea565f87aad70e9e3836366870f9796fd5a205f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 17 17:22:31 2012 +0100

    Qt: delay the progressBar longer

commit aef627ceed84d0ff4f1689254f6ad4680125a45a
Author: Denis Charmet <typx@dinauz.org>
Date:   Fri Feb 17 16:25:18 2012 +0100

    MKV: Don't loop if chapter changes between P and B pics
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit eeac7c94bb8cb51e0bc22d9d42f82fc9ce1e5674)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1307499d35dbc1c7310232ebef64b7c7d4106dbb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 17 16:19:43 2012 +0100

    macosx: slightly the drawing of the mainwindow's shadow when using the black window style
    (cherry picked from commit 3e25b175e26f489d25553b39086efca22cb2dff8)

commit d12a9c6e42ecd53a4a27335bdafe719b80391c2a
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Fri Feb 17 15:04:33 2012 +0100

    skins2: fix a small memory leak and downgrade from err to dbg
    
    This last occurrence of MSG_ERR led to a memory leak.
    In addition, avoid spamming the logs. A debug message is enough.
    (cherry picked from commit 61e145ca81f83a23c188b4dfa0bb62d4fd4acb6a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4bd96e38b1f316654c4d08d28f0b785363f1a78e
Author: Erwan Tulou <erwan10@videolan.org>
Date:   Fri Feb 17 14:57:57 2012 +0100

    skins2: don't stop the whole vlc instance when skins2 fails to initialize
    
    This closes #6064
    (cherry picked from commit 7c693f065ba6866575f8db8a45156d2f370f848c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9b15c78321a4c4659e874596cee8397ff08d8afd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 17 15:58:42 2012 +0100

    macosx: fixed rounded bottom corners when using the black window style
    (cherry picked from commit acc847396cd8d3ef8c246c18da39bc7ac69425a8)

commit 98425fe278d193c4938b99b29b50cd15967644e6
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 17 15:31:07 2012 +0100

    contrib: update libpng because of CVE-2011-3464
    (cherry picked from commit 36fc180ec70896ad6905aa9219dea29e1bc18d20)

commit 742e6c3603ac7bbde1e88d826459b9fbe5c48351
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Wed Feb 15 16:30:38 2012 +0400

    Bluray: try to find mount point if block device file is passed.
    (cherry picked from commit 565422b6a71f4253cc0d17d65f99b2d921bad31a)
    
    Signed-off-by: Konstantin Pavlov <thresh@videolan.org>

commit 2181994e0447b0c513b1d93b425af180cd7a4f46
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 17 09:15:22 2012 +0100

    macosx: fixed wrong behavior of the drop zone introduced in [7f63022f8a94871fd6ca1be2c9c69660ff1d7f6e] (close #6071)
    (cherry picked from commit a2bd73d9b1daeca20684fbc5687b21e1088c3001)

commit 342b7f82e8a97d9f42fc49972f193846ae11f425
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 17 01:03:08 2012 +0100

    Mega is dead.
    (cherry picked from commit cbded926f4b2484dbe3c60f98ac421b8ac839fd7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1b323fbdb88cccf4600e9792687eb49250df60d6
Author: Cheng Sun <chengsun9@gmail.com>
Date:   Wed Feb 15 19:36:02 2012 +0000

    lua soundcloud.com playlist
    
    Adds support for soundcloud.com URL parsing
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 574f292a932d8445fa3a8416bc11988be32728fe)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b922b655f4e4a065d113aad3ed3f51bc1d9d3edc
Author: Cheng Sun <chengsun9@gmail.com>
Date:   Wed Feb 15 19:34:05 2012 +0000

    lua vimeo playlist: no need to parse vlc.path more than once
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit cc56ca3a2afd1c9a1f5f6ed3e42b7f567c2a8bc5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9009035d95b301ffc428d982550560887819cfdf
Author: Cheng Sun <chengsun9@gmail.com>
Date:   Wed Feb 15 19:32:19 2012 +0000

    lua playlist README.txt - fix tiny typo
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9e6d4804a39a007908c95aea8d846256f08e0a3a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9793188aa8820be6c88802080551eadf5d314036
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Fri Feb 17 01:19:24 2012 +0100

    lua: fix available module lists in README files
    (cherry picked from commit a71e35fad15aa90d076ee56ef3dd477cfb20ac2b)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 193c90fae310857d537c533b01eb749a172a6820
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Fri Feb 17 01:04:55 2012 +0100

    qt4: fix TTL and SAP in sout wizard
    
    This is ugly but fixes it for 2.0

commit bc3d16ae1758e9233bba129f410077f3459136b4
Author: Juha Jeronen <juha.jeronen@jyu.fi>
Date:   Mon Feb 13 09:27:39 2012 +0200

    modules/codec/dirac.c: use ENC_MCBLK_HEIGHT_TEXT as UI label, not ENC_MCBLK_HEIGHT (consistent with ENC_MCBLK_WIDTH_TEXT)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4ad109e06337d5c4806c0861170ef1fed011a79f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d3587998694f919d8e91c00c55a35c649e70ea84
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Mon Feb 13 13:46:40 2012 +0100

    lua playlist: extend pluzz.lua to handle france4.
    
    Some pluzz streams are only available on shows pages.
    (cherry picked from commit 951ced78cd13a9ae3837b3cce9acae3533e781d4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5c96b27de4d29217ad8f546484d82957e5a3f090
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Feb 16 22:57:21 2012 +0100

    MKV: Use frame defaut duration for MKV lace pts
    
    This is used in many other MKV demux and prevents the pts = dts = 0 in every lace.
    Fix #5165
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 562813603621bf160868d355f30def8e0a10029a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ef8bdea57f523bbfab513c81f2fbe445d886f63e
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Feb 16 22:42:14 2012 +0100

    MKV: Avoid late picture drop when using many threads
    
    Close #5953
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit fdd1eae579d1847952bcbd5bb2c60b8f46c9204c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d153e8383a05fc0c2d7c16f9872043086917042f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 16 17:27:41 2012 +0100

    Playlist: do not fetch art if you got an attachment as Art
    (cherry picked from commit 36746327d4aef4c6f46e938771faefab4d38c6b9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 82722e41e05d15c2f2cc20f1b59919caddb3dc44
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 16 16:51:42 2012 +0100

    MKV: correctly set the attachment:// URL for embedded covers
    (cherry picked from commit c3119df28b2b90248efed5ee09c5cf6f9bf26bfc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 039661f9eeb29cd0df994e3419843bbf18d58af7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Feb 17 00:12:58 2012 +0100

    macosx: fixed playlist re-ordering through drag & drop (close #6045)
    (cherry picked from commit f04179bd86aded5ee5b46a30b912aa3da894312c)

commit 5b9ffbc60907ade30d4fcb0a1ee25ff1b6147b33
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 16 21:22:51 2012 +0100

    macosx: prevent items from moving from the ml to the pl accidently
    (cherry picked from commit 04c6044391727cf9567ffbcc3c25fa7e8ad8a91f)

commit 023c81ca59e66d348255305aa8c3ebe46ffc0a2a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 16 21:08:58 2012 +0100

    macosx: provide a way to hide the dropzone eventhough the playlist is empty (just press the toggle pl button)
    
    close #5925
    (cherry picked from commit 7f63022f8a94871fd6ca1be2c9c69660ff1d7f6e)

commit c8fc21db8e7bac92801d6c3d6572bf2a8db7687e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 16 21:05:11 2012 +0100

    macosx: remove debug
    (cherry picked from commit b041630bf508e5ea800e975e6fdbe35a6b953545)

commit 3eba0ea3315a70d3df3ff97a8ddc546fbd7207b2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 16 19:53:36 2012 +0100

    macosx: when opening subtitles while playing a movie, try to add them to the clip instead of the playlist
    (cherry picked from commit 6a6539f95f99f9cdebbce39fb7fb80b9efa91804)

commit 0d86ae71dd516af1242011509fca9c357a6ea0dc
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Wed Feb 15 11:37:58 2012 +0100

    add exif jpeg detection to the image demuxer
    (cherry picked from commit 212e7579d65364ed3e749594052b028db8ccf2cb)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit c0db68ff890dac8bc408a1b9c7d9775cac52e7f9
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 15 14:44:09 2012 -0500

    OSX GUI: don't check for interface pointer
    
    It'll be valid the first time this function is called
    (cherry picked from commit f4fb3707e66d259e20ad5de35bcaf599d9c59518)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 15476bf1a9f290e1f2337bb982c832b87d98e20e
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 15 14:36:19 2012 -0500

    OSX GUI: prevent pseudo-random crashes on quit
    
    The VLC interface object might not exist at that point
    (cherry picked from commit a12214d2927d8d3ba177818356e2985d8156b2b5)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 20651de0810e34115709da70219380143aa3e3c6
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 15 14:42:25 2012 -0500

    OSX GUI: move single termination variable where it's used
    
    Use boolean for those variables
    (cherry picked from commit 220a9ee46edcfa8565ad35d4c128ecfaabba9ff1)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit a9ae88b7e6f4f756626d83ca2dfe4ec25fe97d38
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 15 14:35:13 2012 -0500

    OSX GUI: store the interface pointer to avoid multiple accesses.
    
    It saves quite a bit of CPU time over when VLCIntf is accessed several times.
    (cherry picked from commit a8a01ed0307bca22db3f63a4af679da60e266327)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit cb8e90f307b817168d4fa1e1bf0df3ffa710777f
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 15 16:25:43 2012 -0500

    OSX GUI: simplify resizeWindow()
    (cherry picked from commit 20bfa22bb4f8ee7700aed026f9ea968a4699bbaa)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit 8916acb88fa565297d59d27c52cf4a46c18063dc
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Feb 15 19:29:57 2012 +0100

    macosx: fixed alignment issues in the main window's bottom bar
    (cherry picked from commit cc306d3616a8fecb6d85673407534ef8dcf9727b)

commit c2982d200ec065fe642b05c32bf50878ac5f97a7
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 14 08:28:31 2012 +0100

    macosx vout: update display after crop / ar even if "macosx-video-autoresize" is false
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit e6d4348b075ff923f03c82a35925f8410daa70ca)

commit cd24ab2798d3b33e850360361bf79bf2518922b4
Author: Damien Erambert <damien.erambert@me.com>
Date:   Wed Feb 15 16:05:11 2012 +0100

    macosx: updated graphics for the dark main window (close #6058)
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 4e43f2c8b9e6ddf7c83e7cc509f95a0dded6bea5)

commit 48e1b565ddc11f8ddc3f2e1e99c13eb81142b83e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Feb 15 15:14:34 2012 +0100

    macosx: start the right playlist item when adding new ones
    
    fixes #6048
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit ef8a9e7e3aef1d64a969047059ba5c8ad6c6873b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e176fa2ff58f537e6666227ae0797161160d901e
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Feb 15 15:14:33 2012 +0100

    macosx: make sure that non-embedded window is not visible when we play audio file
    
    This is especially needed, when a video finishes and the next item in playlist is an audio file.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 79240eea54682736742dda87d26db27478f569ed)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 310df390afdb9f124c13d952faf60dc362006793
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Feb 15 15:14:32 2012 +0100

    macosx: make fullscreen animation compatible with non-embedded window
    
    makes sure that the non-embedded window fade out properly,
    also leaves the main windows visible, the user wants to probably see it when it is on another display
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 2661f755cc8b787f5838d76f2574fc8966206cf5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 268853101fce3dbd8390bdcd0eb009c1fabfb8d3
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Feb 15 15:14:31 2012 +0100

    macosx: choose right default screen when entering fullscreen
    
    this is expecially important when MainWindow is on one screen and non-embedded window on the other
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit def306c55eecc85178251c5ed0d3a36728dfc367)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5477b8a26f3f2e207866a961c334bd10f37dc47d
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Wed Feb 15 15:14:30 2012 +0100

    macosx: make sure that isFullscreen only returns true in an actual fullscreen window
    
    this fixes the issue that nonembedded window was not allowed to resize itself (e.g. after aspect ratio change)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f54b9825b022d1c81d734ed8ebad5fc16faba5af)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6951818d5716f80c55160a7d1eb5c20618b56a40
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Feb 15 15:37:12 2012 +0100

    macosx: make sure the interface doesn't leak any inputs. fixes crashes on quit after adding a file to the playlist
    (cherry picked from commit cf8441a23c17e1f17feedfd8681f0d846cb7d19b)

commit 6bbadce75e515e5b3bb5af726ec3572bd04bd4f8
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Tue Feb 14 17:40:06 2012 +0400

    COPYING.*: Use full versions of licenses.
    
    COPYING: use http://www.gnu.org/licenses/gpl-2.0.txt
    COPYING.LIB: use http://www.gnu.org/licenses/lgpl-2.1.txt
    
    As described in FAQ, one shall not trim those down:
    http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html#GPLOmitPreamble
    (cherry picked from commit 7665bfa31e2ce4f3d7b08900b67589149f60fd77)
    
    Signed-off-by: Konstantin Pavlov <thresh@videolan.org>

commit 9d2a09302a4c12c5cb312a5db93ce3c2c329b222
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 15 01:24:33 2012 +0100

    MKV: workaround the seeking-to-0 issue on Win32
    
    The faster way to seek does not work on win32, for some reason
    Close #6006
    (cherry picked from commit 3d4937278085b979683fe0db96e3516a75bc81c5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 760d145f95a82980d77415153f43679c8abf73eb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 14 18:53:49 2012 +0100

    MacOS X: fix no menu dvd MRL in open dialog
    
    Close #6027
    (cherry picked from commit c0433c8bbe69b5a5aa5ea603a77068d29c1c0d4f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 785ebcc0277c5d33c1d71bca9f578e9c693f1919
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Feb 14 18:39:17 2012 +0100

    macosx: since Cocoa expects the main thread to quit (and needs to run on the main thread in the first place), we cannot join the macosx intf's thread (fixes #6026)
    (cherry picked from commit 55c6f68897a18e906edebc596c84c2ad43f78f3f)

commit 348b457c18299974b7a302ca537611e32a09f8c1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Feb 14 08:50:57 2012 +0100

    Fix Croatian installer

commit 9c403663b577062c635e16ad99a281aaaaf9f109
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Feb 14 00:12:38 2012 -0500

    Fix typo in [f0298d1a8]

commit 608d2841d98e1f35b4d8145cd61c12042b839770
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Feb 14 00:04:43 2012 -0500

    dxva2: fix chroma pitch calculation
    (cherry picked from commit fece3fcfffaca0bb13356c04010cb129f72a8b02)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 20d2602c158fb7d2e40d762c575549031823900c
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Mon Feb 13 23:40:49 2012 +0000

    Typo
    
    Fix compilation on Powerpc *nix
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit c2b2e6a152bb8b03b447d952acccbf8cfa3f479e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Feb 13 00:51:30 2012 +0100

    Update PO

commit 18e545d8569de819a37c99ffb5d0f7086afe171e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 12 20:41:03 2012 +0100

    macosx: implemented the sidebar completely to support switching between the playlist's top-level nodes (fixes #4944)
    (cherry picked from commit 59a028786195c9a61c62b65e66c7c6d65a04c93b)

commit d814ffb835d1c89a7e018719680643bea4aff2d2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Feb 12 23:47:30 2012 +0100

    Avcodec: deactivate DR on cinepack
    
    Close #5872
    (cherry picked from commit c7b493435fe3855e2cc4ca168756d73a62d8b85f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f0298d1a8cf42c3464cec2587e3586a0028dae74
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Sun Feb 12 22:33:18 2012 +0000

    nsis: activate slovenian and croatian translation

commit 10c47799d710a38b31bba60429e5b772b3ceb400
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 12 22:25:21 2012 +0100

    macosx: minor optimisation as suggested by Rafael
    (cherry picked from commit a97866c8f25d9d7645519a3a759683a9a17e2281)

commit 1c9dbace428e93a98c2e762e61701aa2a0285e55
Author: Marián Hikaník <podnety@mojepreklady.net>
Date:   Sun Feb 12 20:50:18 2012 +0000

    l10n: Slovak update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit c2e044275cd80a05dc94d7acb23b01de5bc10020
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 12 20:54:36 2012 +0100

    macosx: improve dropzone resizing (fixes #6018)
    (cherry picked from commit 09eb7369def8cb77e0958a690b7e35deb4ddb57c)

commit 3e6ea2c9e3beb7f0363117c19b57c42f587dd286
Author: Benjamin Drung <bdrung@debian.org>
Date:   Sun Feb 12 18:35:53 2012 +0000

    osdmenu: Tweak config file for installed system
    
    And not for in-tree running
    
    Close: #5111
    
    Signed-off-by: Christophe Mutricy <xtophe@videolan.org>
    (cherry picked from commit f2b874d502441235b2fe6f36147ac3d91d1adec2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 133cdf3d0d59cba2f61517c226ff85e74d7a6097
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 12 18:31:11 2012 +0100

    macosx_vout: fixed flicker when resizing the vout through AR or crop changes as suggested by David Fuhrmann
    (cherry picked from commit 546bfa6bab387cdc783b7cd6fb4f003af5e280f3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 548b7249b902d107b37f2779de4c335828c227a1
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Sun Feb 12 17:10:44 2012 +0000

    l10n: Correct Kurmanji ISO 639-3 code
    
    And add a symlink ku symlink to it. Acording to wikipedia 80% of kurdish speaker understand this dialect. User can still select Sorani with proper locales setup

commit ad3cef62b1a56cb4bf40f84f50ae67eafc2ba7e6
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Sun Feb 12 16:40:23 2012 +0000

    Update LINGUAS

commit 9b5dc3a3d8620edfc8bca2fe28c24ba1af575440
Author: Praveen Illa <mail2ipn@gmail.com>
Date:   Sun Feb 12 16:38:02 2012 +0000

    l10n: Telugu update
    
    With the good file this time
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit a325da4d8d71a65ad76759566abf7a9ea7b3a1e8
Author: Praveen Illa <mail2ipn@gmail.com>
Date:   Sun Feb 12 16:11:16 2012 +0000

    l10n: Telugu update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 33986165576f2d7d924808251bd6d61fd579b3d0
Author: Gonçalo Cordeiro <gzcordeiro@gmail.com>
Date:   Sun Feb 12 16:05:11 2012 +0000

    l10n: Galician update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 91eb796ac1e28b5d397e0dce2a845ac239ac67f5
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 12 17:12:37 2012 +0100

    macosx: fixed caching preferences (refs #5994)
    
    also includes a minor fix to make room for the wordy German l10n
    (cherry picked from commit 9892a1cec049f83168e468e23131713532f2d38b)

commit 6495e042cc5a9e1893f550c9875edd5c42b5e9df
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 12 16:45:45 2012 +0100

    macosx: save playback modes on quit and recover more gracefully
    (cherry picked from commit 20b891eba5bd68353f1a65fb5cae6bed490de827)

commit 75c9feeaec730dbf580845963ef3dccd4a1a5fce
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Feb 12 15:13:34 2012 +0100

    Be more pedantic for the theora library versions
    (cherry picked from commit 22f92c935bf8d6b789afefc13c01014ccede3576)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0d8b41c28a9f178deb3e02891a253c20c2efd2ed
Author: Theron Lewis <theron@bittorrent.com>
Date:   Fri Feb 10 14:52:37 2012 -0800

    Use newer theora API and fix crash
    
    Close #3841
    
    This updates the theora module to use the newer API introduced in Theora version 1.0.
    It solves a crash on windows that was caused by reading past the end of the YUV structure due to an incorrect line count.
    This has been fixed by using the minimum line count common to both the source and destination of the pixel data.
    The new ycbcr structure in the new API makes the picture copy much more straightforward.
    
    Modified-by: Jean-Baptiste Kempf <jb@videolan.org>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 1014cc350fda0e8a1ffd368348a823cd9e84fce0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6c518adc8ce3fe9fa5aff28fe96e8ac7e453214b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 20:52:23 2012 +0100

    macosx: fixed bluray MRL
    (cherry picked from commit df61155f0296dcf0fde91c49b18370b5eafec006)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d09ead662339b5c8495d5096532395876460d824
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Feb 6 15:50:50 2012 -0500

    dxva2: support IMC3
    
    It's the only output format on my GMA 3150
    It is identical to YV12 except:
     - U & V are swapped
     - U & V pitch is identical to Y pitch (first half is plane data,
     second plane is padding)
    (cherry picked from commit b2fc6dc9c0393ab149dc5ea13d9a86c107a9b163)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 37acc4f2c49f23677894f070fecd4f786900b63f
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Feb 12 11:13:06 2012 +0200

    DVB: discriminate ITU-T J.83 A and C annexes if possible
    
    This requires Linux DVB 5.5.
    (cherry picked from commit 0883ebb27eea3a83365e823da00331213e89aae3)

commit 8543f71ea08473375ef53205215cefb8680bfb6e
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Feb 12 03:02:47 2012 +0100

    metachannels: fix playlist script too
    (cherry picked from commit 33c3fd72a6a02eeb67866a4088e4287ff02c5f5b)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 80790ed6157085b04c29ea03d2bf051279752761
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Feb 12 00:26:39 2012 +0100

    metachannels: fix search function too
    (cherry picked from commit 9dd9ba6340fe8591b673f0f786b8d767da81b891)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 637c9b52d29791f27368b84483a305441bbeb6b0
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sat Feb 11 23:35:44 2012 +0100

    metachannels: don't crash if image tag is missing
    
    Fixes #6008
    (cherry picked from commit e0a19b96e8a920a37ba59f4418bf955df18b0561)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 2cacb5fb6e3248b177189ef84a24c0a0429555a8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 17:59:10 2012 +0100

    fixed make dist
    (cherry picked from commit 79b982141109d5d6bf299f247b6b2efedc069817)

commit 8946b325b135324e26f84b6464a7f072911daf65
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Feb 11 15:37:37 2012 +0100

    macosx: don't allow lion fullscreen in combination with nonembedded window
    
    If you try to combine both features, you will end up in an fullscreen window with
    playlist and overlayed video controls. Therefore make sure that both cannot be enabled
    in simple prefs, and in case the user used advanced prefs, priorize nonembedded window
    over the lion fullscreen.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 051f8476664a5e329169d38ced11e6e47f96020e)

commit f95fb133fa0a13e8a419e7e92d57bcfc77bd4e81
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 16:10:39 2012 +0100

    macosx: l10n fixes
    (cherry picked from commit ad0a2b09ca28c1cd295ed7a1dc8a9f22885c46a6)

commit d44f629e1a8ac95d5e5b40ccb0b7d6096442b584
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 16:11:03 2012 +0100

    de.po: added missing translations

commit 6955d6a3d8d8da5ac818a57408b0d48805bea4c7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 16:00:11 2012 +0100

    macosx: make sure there is a sane default value in the QTKit selector's size fields
    (cherry picked from commit a7f2e897deb230a9a43bb4c6673833f52db968bb)

commit a0c1555b27c7cdbaf458b8dfa6d499b844b04d47
Author: Kaarlo Raiha <kaarlo.raiha@gmail.com>
Date:   Sat Feb 4 19:16:29 2012 +0200

    Support opening over 15 files at same time via Windows Explorer
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 39946942823e093b06d24b416ad83acc263c210c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a8b274e7939f7d3838e2ac8c50ec1c6039464fae
Author: Rob Jonson <rob@hobbyistsoftware.com>
Date:   Fri Feb 10 11:20:34 2012 +0000

    add http commands to select title, chapter, subtitle track, audio track and video track
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e0092fc5cac0a52c15210ecf05e8f0f463a6f956)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1aa6fdb6de791d9b3a4c06d950cb5da0d7db9843
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 15:25:34 2012 +0100

    macosx: re-write the resize control used in the black window style to use the MouseDown event instead of the MouseDragged event which is ignored on Leopard (should fix #5822)
    (cherry picked from commit f2a677c05602a0f7cf3fd31d93491126ad8fcd8f)

commit b00b902e108c0cdbc24968ed195af1b2381350e8
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 15:04:37 2012 +0100

    macosx: make sure the fspanel is visible when using 'float-on-top' in combination with Lion's native fullscreen mode
    (cherry picked from commit ce572957b5fd7184887f6b4f83ea7b1c78402462)

commit e04ff8cdf60909a350759508032c9dac86216a95
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jan 4 18:49:38 2012 +0100

    contrib: add support for openssl to check the sha512 hashes
    (cherry picked from commit d486e3110f5a95e29606d22ed2c70ed9662526b2)

commit bbc6cea1d77bf176891f83115a649e1fed929afe
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 14:31:16 2012 +0100

    macosx: hide the time slider's gradient effect on launch to prevent visual artifacts
    (cherry picked from commit ed1b153067b01adc633101ea615bd821d326b17b)

commit 6b58bd9cd2550c8f9a98ee227782a2f00b127a86
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 11 14:28:54 2012 +0100

    macosx: make sure the splitview's left subview is big enough on initial launch (fixes #5855)
    (cherry picked from commit d8779407bdda30a7fb8b8fddeafb83b921a0aad3)

commit 6501a860256f19d6c1623d733c128b17a6d86c33
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 10 23:02:24 2012 +0100

    Update of NEWS

commit 78f8ef0787f09fd7bb36787a986e0c9525247b8d
Author: Brad Smith <brad@comstyle.com>
Date:   Fri Feb 10 16:03:38 2012 -0500

    Fix compilation due to missing headers on OpenBSD/powerpc
    
    When the code for detecting the number of CPUs present was moved
    the headers necessary to compile the AltiVec detection code on
    OpenBSD/powerpc was mistakenly removed so this puts the headers
    back as appropriate.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6f8c945b940ca5c398d2fb20e1ee4983e1c9feb4)

commit 31d875e0736eb682be92b56fb45e09357f8c93d8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 10 18:49:27 2012 +0100

    DTV: add dvbt shortcut, for old-BDA module compatibility
    (cherry picked from commit 1a459c1ccb0d617580ec97bae992f01a799a5e9b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6fc271e1b2f57a103c893fb2ee79f99fa15f9d30
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Feb 9 00:18:00 2012 +0100

    Qt: do not put an email in the interface
    (cherry picked from commit 86aab926b11c0dfddb7a1603b66a8ccaef738471)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7d3b2e27c270344c1e70bd39f5baa1f33e4442d9
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Fri Feb 10 20:29:21 2012 +0100

    Used linear filtering when converting chroma in D3D.
    
    It seems to also be used for chroma upsampling.
    It fixes #5751.
    (cherry picked from commit 760e0cba0df6e11a1ac20ac6b678b60c6fa9e95c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 079233bac019c5a956f14da99ac64898359afb23
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Fri Feb 10 20:37:50 2012 +0000

    Typo
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 729c212cb1813eaac2080f0816c3f94feed4c455
Author: Sidney Doria <ssdoria@gmail.com>
Date:   Fri Feb 10 20:30:31 2012 +0000

    l10n: Brazillian Portuguese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit a992bd784af12c3783146c7e6d0f35960b0d7186
Author: Ajith Manjula Senarathne <uthmax.sms@gmail.com>
Date:   Fri Feb 10 20:29:26 2012 +0000

    l10n: Sinhala update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit ab67427245eebc714e8e3acd4dc56c67f19eb821
Author: Juha Jeronen <juha.jeronen@jyu.fi>
Date:   Fri Feb 10 20:28:17 2012 +0000

    l10n: Finnish update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 5a2523c6df6a052cfb61ca006775a68cc029de5a
Author: Dominko Azdajic <domazd@mail.ru>
Date:   Sun Feb 5 13:32:08 2012 +0000

    nsis: Croatian translation
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 612e51420964fe5b30a4e1162756913f52de1d0b
Author: Dominko Azdajic <domazd@mail.ru>
Date:   Sat Feb 4 15:58:16 2012 +0000

    vlc.desktop: Croatian translation
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 55075b54639b48d472152776aa256d658f63969d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Feb 10 18:30:15 2012 +0100

    On the road to 2.0.0

commit 380f0cc495cb6699c9a68e08b8f0e7d83e913b1e
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Thu Feb 9 21:54:43 2012 +0100

    Qt: don't offer the lua CLI in the preferences on windows
    
    It is broken
    (cherry picked from commit 4a44907ad72b67a777d2f98fde44d2a53603f66e)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 2d2908663c023e596a0cad089fdaab08854f99b2
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 9 13:47:59 2012 +0100

    macosx: updated eyetv plugin xcodeproj (fixes #5299)
    (cherry picked from commit 87387eec4568cc4fdb4bb6782f71be907bd3dbfa)

commit 53818c6f2136d136e86e72c7eb707cbf88c728c0
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 9 13:46:50 2012 +0100

    macosx: added PackageMaker project to create the EyeTV plugin installer
    (cherry picked from commit b79a47d8d06a83459a4e2c684633d75e3fe717b8)

commit e0a547b585ccdd1cec6926c92e406785e1e46c70
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Feb 9 13:07:32 2012 +0100

    macosx: fixed zooming the main window when using the black style (fixes #5998)
    
    also make sure that the hotkeys plugin displays the correct string when autoscaling the vout
    (cherry picked from commit 42444e4fa148bbf7ff177d15a927156e5d367f1f)

commit addba2559a6e4988652f8e7580947a2884b617e0
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Feb 9 00:40:38 2012 +0100

    macosx: let fullscreen controls show the complete time information
    
    Tested with big and small controls: now the time for a video >= 10h is displayed completely
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit b115a253ead9887283b0f043a2759f154702dadd)

commit e27556b4506e8eb7f7f17eb55a3aa860ba227d48
Author: Denis Charmet <typx@dinauz.org>
Date:   Wed Feb 8 23:30:44 2012 +0100

    Don't treat truncated files as invalid
    
    Fix a regression introduced by c8b78f40656
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 1e95ac231d3849360466bc273f4f608211b61ab9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7a4c715522d0237ab0869212d5ac97ae1b0019ec
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Feb 8 20:42:34 2012 +0200

    Qt4: add Linux discs choices once, not once per focus
    
    Pointed-out-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 500c1902bb2e2885e7aaca1f45a59ec26fb389e4)

commit 08d0d80f0cf53fcabb2d366ac31d9fe5c92b8fe2
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Feb 8 19:53:53 2012 +0200

    Qt4: encode disc MRL correctly (fix #5638)
    
    (cherry picked from commit 9b247e7c299f53c905278c45bf45545dc4bcd390)
    
    Conflicts:
    
    	modules/gui/qt4/components/open_panels.cpp

commit 69dba1e6e615b38a8680c90e6d50d244dda93113
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Jan 25 15:19:35 2012 +0100

    hls: Adding missing locks.
    (cherry picked from commit 348b17855b171300e0f07c81b995325d71f0b564)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fe06664fb76b713248d43411347ae09dba4a4886
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Feb 6 12:05:21 2012 +0100

    hls: Fixing a memory leak
    (cherry picked from commit f372e0fc69074921c1f5b02893770fbee8464ef6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2c5b54ffd83cdd026bfc3a8f8e13ddc733c6cde2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 8 12:51:48 2012 +0100

    Qt: hack for extraintf to select http, cli or telnet
    
    This is not the most elegant and completly perfect, but it will do for
    now...
    Close #5986
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit cf70aaa18f4eaf1a3ae139d1de968589a3c5b11a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3619b74b9a70e9ce6c493980d160d68dc48c8c81
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 8 12:39:34 2012 +0100

    Qt: use the new function to factorize code
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 720302118212288eb27eb31f077253b5dd2e83ae)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 569fb30f36d3c7be8891bb053955d5884db5307f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 8 12:31:02 2012 +0100

    Qt: provide overloaded checkbox_list method
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit effc65ccba7bb037e3c3b7d8ca0a07a45ae07c4c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5faca1b8bf6c0e30804f462d7a7c64cd62a33e8d
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Wed Feb 8 13:59:24 2012 +0100

    fix handle leaks on RegOpenKeyEx
    (cherry picked from commit f111847917894e8e5e832a5e2b850d229a4ceebc)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 024c0a8f25d5fac9580b5ad0fe8980779d700dd4
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Feb 1 17:25:31 2012 +0100

    Qt4: preferences, move a Macro to a normal function
    (cherry picked from commit a728a7ede2500febe9003c9b1cc6170f167cb821)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0262b935916cf4df377f04811a476a13a689009e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 22:48:19 2012 +0200

    dbus: capitalize shortname correctly
    
    (cherry picked from commit e6fde43b4a01cf0fde3e6f385c04099e46dbd036)

commit fa585eda57c64ed0b6e3d2a9f90126f67ceb1eaf
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 22:30:43 2012 +0200

    dbus: remove useless intf_sys_t.b_unique
    
    (cherry picked from commit b740301ca1847714f7c625b350379c859b99292d)

commit acb1f5279b1da2fcd499a29d704936b722251d93
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Feb 7 22:14:31 2012 +0200

    Remove stray -O flag when testing for MMX and SSE
    
    (cherry picked from commit d13f0eaaed1232ccfb09a4b81aafcf864351e3e7)
    
    Conflicts:
    
    	configure.ac

commit e13abb90baf4f6cba4055d1a6997541d0be4d9aa
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Tue Feb 7 13:01:32 2012 +0100

    sout_std : do not crash if no destination is given
    (cherry picked from commit d923971d4597147df659bb97690f0e0e0741b895)
    
    Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

commit 0bff3a72381e92376c87e4d0b14e9098a8a38edc
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 19:42:16 2012 +0200

    contrib: a52: remove scary dummy error messages
    (cherry picked from commit a8ad08b24825b310d10bbc9846ad0a7000c418b4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a0297f63e9d327e96863159dbc547cc56c6e67f8
Author: Jean-Paul Saman <jpsaman@videolan.org>
Date:   Mon Feb 6 16:18:55 2012 +0100

    stream_filter/httplive.c: various cleanups
    
    - rename copied to used in hls_Read()
    - improve comment in hls_Read()
    - add assert() to GetSegment()
    - various cleanups
    (cherry picked from commit 5b30daa8add8e4563fc26a33e73fa7353f810ac9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a6d6d948c322258ae8e2b4be91d8b8a6d02c1f58
Author: Frédéric Yhuel <fyhuel@viotech.net>
Date:   Wed Feb 1 13:04:48 2012 +0100

    HLS: clean Read function
    
    If caller wants to skip data, there is no point to allocate a buffer and
    put data in it. We just have to update the stream position.
    
    Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>
    (cherry picked from commit 6fe18b3e023d1c58571d982cc41b43363c45cfae)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 09d44799e59160dbafd62184cd46c1fd96411d0d
Author: Frédéric Yhuel <fyhuel@viotech.net>
Date:   Fri Feb 3 16:05:14 2012 +0100

    src/input/stream.c: improve documentation somewhat
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 5ebbfb5b476207bbd9a36cd25c725f1b2231738d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f778b8bb35d6bc8cde56d8e5802f9c8d7a30b385
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Sun Feb 5 15:38:13 2012 +0100

    dbus: Fix a couple of warnings
    (cherry picked from commit 21e8a014d73b2ea532fd2bd77fbdca09afce8a32)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 634d1c982dbaf42857576e05650f7ff5eaab41b7
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Sat Feb 4 16:41:06 2012 +0100

    stream_filter/httplive.c: indentation cleanup
    
    Some small indentation cleanup.
    (cherry picked from commit 446013a5b8fc9872eb0db3aee0ee65e8c551b8b8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d3d3c393976056da3a36043ca0add67ee3e0b294
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Sat Feb 4 16:34:43 2012 +0100

    stream_filter/httplive.c: kill some depreceated vlc_object_alive()
    (cherry picked from commit 6ae98eec8783f84576fa3bae5bd40b3cee618a97)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a0b699c956f7f14f266c6063d1c7cac73f1c3791
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Jan 29 02:53:41 2012 +0100

    hls: Fixing playlist reloading.
    
    This patch fixes a case triggered when alive stream does not "have" a meta playlist. In
    that case hls_Copy would fail as the uri is NULL. Restore the old behaviour by using the
    base URL locations as input.
    
    Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>
    (cherry picked from commit 64df9df7c3ec0141d8f9421e9177b2a94e21dba3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 21caf19bc4d6d794c40efdd01f063a6172c4eaec
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 7 09:43:18 2012 +0100

    macosx: further improvement to updateWindow in order to include also the non-embedded window
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 6c5e08586e4cc8ac97ddcf43b6291ebc872546a6)

commit 0d1b820c72355270b1adcf1d4b792a471669dc63
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 7 09:43:19 2012 +0100

    macosx: fixes aspect ratio / crop functionality in some cases
    
    With this commit the mentioned features result in an actual change, when we are in fullscreen or "macosx-video-autoresize" is false.
    Furthermore, this fixes nasty flickering when normal window is changed in size while using this features.
    Also this commit makes sure, that no window resize is happening in any case, when "macosx-video-autoresize" is false.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit fa7456d3cddcfc2ad238ac3102463eef84d134a6)

commit a13d32fb4b0ae02ca12d607a4c4067d42de1bfad
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Tue Feb 7 09:43:17 2012 +0100

    macosx: fix start and end rect of fullscreen animation when we have a non-embedded vout-window
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 7ecb24c8689710e32f71e20d2cc51ae5b57e7151)

commit ac2f9d9a70b359588a142ddc3f04f92d63a27d95
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 20:50:10 2012 +0200

    GLX: use separate XCB and Xlib connections (close #5698)
    
    Some GLX drivers, such as newer versions of the Intel drivers,
    depend on X11 events coming from Xlib. So VLC cannot steal them from
    the underlying XCB connection.
    
    I have no time and will to duplicate the XCB code found in the GLX
    plugin for windowing and events handling using Xlib. So lets make a
    separate X connection with XCB. This is inefficient, but it works.
    
    On the plus side, this patch removes the dependency on libx11-xcb.
    So it is now possible to compile and use GLX with an Xtrans-based
    Xlib (though libxcb must be present).
    
    (cherry picked from commit 63a73525adc604aad1282f5479660ee953cc6704)
    (cherry picked from commit f886dc146251ea12443aafbcf77b99871c3e7c84)

commit 0c8f84cc05516c065aaf21897089b120e361cd37
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Mon Feb 6 20:39:42 2012 +0200

    GLX: cache XCB connection pointer (no functional changes)
    
    (cherry picked from commit b8bec8eb9217e5a525f78777962c10b40838bc4b)

commit 03a9205f3016bd1be5ea12e43c902346d260ccc0
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jan 24 18:55:31 2012 +0200

    Properly remove the old dvb plugin, fix bootstrapping
    
    (I do not know why it was removed in the first place though - not me!
     As a consequence, we cannot scan TV channels in VLC >= 2.0...)
    (cherry picked from commit d0413f1d8b0f16001a6c0820a081ce81fedf6b65)
    
    Conflicts:
    
    	modules/access/Modules.am

commit e91fe501e1447b317b3417d32996a0be8db58625
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 15 16:25:31 2012 +0100

    macosx: fixed distribution of 'Delete_Preferences.app' in the nightly build packages (fixes #5853)
    (cherry picked from commit 7ba4686d425697a1dda865b4369367a00f5ef91a)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 5b4c0e7dd790c47fdc27875700a839e5497d2f70
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Dec 17 19:18:49 2011 +0100

    MacOS: do not thip the changelogs, it is useless
    (cherry picked from commit c29797349261fa30bc2521968d14118d2168d0de)
    
    Conflicts:
    
    	extras/package/macosx/package.mak
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 75fb495afd459c23dcecc5380ea00f7866d453fb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Feb 6 00:41:36 2012 +0100

    macosx: use the gray window style by default (fixes #5984)
    (cherry picked from commit c80216bf874334e8f41374858813a8bd30c7d0be)

commit 8d158f7ab8efdc8a967927f050c74ae9b1084011
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Feb 6 00:24:27 2012 +0100

    macosx: make sure that all the tooltips in the sprefs panel are actually displayed in the user's locale
    (cherry picked from commit ea3cc710ffba1e27dece6a7efea2fe1c7a6b01f6)

commit cba98710cf0b8797db9cebfcc23668ddd953c543
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Feb 6 00:04:03 2012 +0100

    macosx: added 2 options: 'macosx-pause-minimized' and 'macosx-video-autoresize' (fixes #5861)
    (cherry picked from commit 2d83cb8bef1a1d4ab8b6c81a7724a838d59d80a2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eafcec0aa35018cc5fa16c0f8465dcc1af8d9a69
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 5 22:37:27 2012 +0100

    macosx: don't resize the vout in case VLC is in fullscreen mode (fixes #5920)
    (cherry picked from commit 08159b75912049c454e8abd01d9be7873e494b35)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d6c3449ddc7252b8d69ad9aed1c9f9da171d0208
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 5 20:27:26 2012 +0100

    macosx: added a 1.5px shadow (white) to the window title and the time counter
    (cherry picked from commit ee6c4a295a494f6670c1466ce9cc360c8b414f9e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 50c5fd830d2743b0dade3e07a099a230f121a25d
Author: Tobias Güntner <fatbull@web.de>
Date:   Fri Feb 3 14:01:18 2012 +0100

    Remove constructor
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 64337e22d9a2f0f7ccbb71f55dd7e6cd78b39ba2)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit a3b9ceac08a8d62c2923db81c1c8b98ad4030634
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Feb 5 13:31:52 2012 -0500

    Remove allocine french-only extension
    
    It is now available on
    http://addons.videolan.org/content/show.php?content=148709
    (cherry picked from commit ce76b2b4f66293e2d48e664a22c1508e15541009)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit ad9fe196a76ef9e7068139182c535d329f198025
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Feb 5 12:46:04 2012 -0500

    Mention 2.0.0 instead of 1.2.0
    (cherry picked from commit 90b7695c83dc677de4c29242341d5e0cf1c238b4)
    
    Conflicts:
    
    	po/te.po
    	po/vlc.pot
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 163a238a846c2f80f72d951ec5b45417022e0648
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Thu Dec 29 16:56:44 2011 +0100

    dbus: Implement org.freedesktop.Properties.GetAll for the MPRIS root interface
    (cherry picked from commit 12179aca0d615f9999ccf9c2c7645f5b368f2ba9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2a079e5cd9d57fc58a139652870edf82a208b944
Author: Mirsal Ennaime <mirsal@videolan.org>
Date:   Thu Dec 29 14:27:45 2011 +0100

    dbus: Move DBus property marshaling code to separate functions
    (cherry picked from commit afbf044935584488d8a86233ab969574a7ec1c4c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 98e662b36d867d3baba5fa429e807ff2cb77b7c2
Author: Jan Winter <jwinter@gmx.net>
Date:   Fri Jan 27 14:27:41 2012 +0100

    OSX: NSDistributedNofitication is sent on playerStateChange
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 2ad64d87724ffe0256d6ac8056e2ef4af5b1192d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9c574fe14a6604e9c588521808c34c24f1e434ac
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Feb 4 18:14:59 2012 +0100

    macosx: only show fullscreen controller when the mouse is inside the video window actually
    
    this is especially important in multi monitor setups
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit c33a6b5e6430d0727b932dc78d048ab4f9f6642a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1bb4ebc24650078b3116c9214304713116e7ece1
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Feb 4 18:14:58 2012 +0100

    macosx: always make the fullscreen window front when in fullscreen
    
    This fixes several issues when you move your mouse outside the fullscreen at an
    sedondary display and reenter vlc with the mouse. Now, the controls are shown
    reliably and the mouse movement actions work as aspected in that case.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 28dd1b12276e44ea598c75c4b893cb574375541a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 05bd0ced0a6bb059f3381b7d9df3e6acf8120379
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Feb 4 18:14:57 2012 +0100

    macosx: save volume in prefs only if controls are editable
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 53b2dfec818f44b33bc6e52a5a81fab2cb346cb2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ec5729a73831da60daab2a23cac06f4a15b4c75b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Feb 5 14:11:42 2012 +0100

    macosx: removed hacks which could lead to crashes when quitting VLC
    (cherry picked from commit 69e78ded598bf2520c21272774f8b3cf2eca32be)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9037d5f93ae9907fb40cb79024cd8fb645a86546
Author: Kelly Anderson <kelly@silka.with-linux.com>
Date:   Fri Jan 6 08:36:56 2012 -0700

    Change goto to gotoitem for lua 5.2 compatibility. Maintain lua 5.1 backwards compatibility.
    
    OK, this patch should take into account the recommendations.
    
    Signed-off-by: Antoine Cellerier <dionoea@videolan.org>
    (cherry picked from commit 9934897a3bfcfb8518ac35d9f1e24c6ce18761af)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 62e272a63eeacdfda53a39faff2e0715be993e9d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Feb 4 17:14:36 2012 +0100

    macosx: force some more methods to run on the main thread (refs #5779)
    (cherry picked from commit da2ee7c7c0820dff6dce29274fe213b1a4279c1b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d875f53b162d9cbc488a18814999b2e70627ca2f
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Feb 5 03:29:47 2012 +0100

    rtp sout: fix integer overflow
    
    This became likely to happen using VoD. Thanks to Denis Charmet for
    pointing out this issue.
    (cherry picked from commit 7ed3e0e4fa7b2e1d33f78eebab2b1b4fa9201049)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit affa5aa53734f0ba69c75f78a1688c68c5b22c5a
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Feb 4 14:03:53 2012 +0100

    Contribs: deactivate more libav* part
    
    Deactivate totally avdevice and avfiters
    Remove bink decoder that does not work in VLC anyway
    (cherry picked from commit 2eccf89a46d5707b81c529ec7a7706acf7ab3303)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cf8e77010c96eb3e423366a39006fff9ee441673
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Feb 3 19:47:00 2012 -0500

    OSX build script: be verbose by default
    
    Don't hide the needed steps as it confuses users reading the detailed instructions
    (cherry picked from commit c6a45bd97c0e196ecd3b9c9d45db9ad21e98bb4d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 419fc074bbc3bc15cce2a550cded4660d3ce8725
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Feb 2 18:20:51 2012 -0500

    cppcheck: move after definition of CC
    (cherry picked from commit c507541a9ba974f82fd9a28c92d1c5e083b9658b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5547aa245cb08beb60b5a1b3805709443fafed64
Author: Antoine Cellerier <dionoea@videolan.org>
Date:   Fri Feb 3 19:08:48 2012 +0100

    Fix --file-logging on windows (that was stupid...)
    (cherry picked from commit ad3507aa9d470edeb446c08b654c8d68631aa105)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2f6edbecbbc99a1d19b31a5f98d18bf3ec05f2f0
Author: Antoine Cellerier <dionoea@videolan.org>
Date:   Fri Feb 3 18:24:54 2012 +0100

    Set a default user agent on windows vlc too.
    
    This  complements  commit dadb0622e6244456f7b5576ab2f9aa0c6582c68  which
    moved  responsability  for   setting  the  user  agent   to  the  client
    application.
    (cherry picked from commit a3363d01443de5b3ff8b9762692662623e70d786)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f426cd4b48c2eb2992072327caa51314430f4616
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Feb 3 12:32:24 2012 +0100

    hls: Ensure streams are sorted by bandwidth.
    
    THe standard doesn't guaranty anything, but the code assumes it.
    (cherry picked from commit e2942aee746d12ea0bed999e8110bbbead3ca72d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e8ac4adac65da0ddc4eeddac35a66cfe586913c3
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Feb 2 16:24:59 2012 +0100

    hls: Don't download the same segment twice when prefetching.
    
    This makes the playback start faster.
    (cherry picked from commit 1555e3ce33ff3a75c19fdae4af08d052aed734c8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d284e14f44bb00dfea4ead13f7e5d743f47967b8
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Thu Feb 2 20:53:44 2012 +0200

    transcode: typo
    (cherry picked from commit 7a081904313dbad5a46e6e095c70d226fa122c09)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 11f1b1a7034b72d0ec3af32a7bc98239d45b917f
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Thu Feb 2 10:40:19 2012 -0500

    Android: disable tremor
    
    http://www.compdigitec.com/labs/2012/02/01/android-codec-benchmarks/
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit e6dd93cfe14c837d95dd29d24fc8e86924161c53)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b7d9f84907202ba975cb7429c9c5b311af5f5f9c
Author: Edward Sheldrake <ejsheldrake@gmail.com>
Date:   Thu Feb 2 16:23:47 2012 +0000

    Fix dbus error (close #5977)
    
    Fix dbus assertion failure which aborts vlc when the dbus control
    plugin is active and you try to launch vlc with a large number of files
    on the command line (such as when doing "vlc *" to play all the files
    in a directory).
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 2e1a59d0a1fcca58171b890416a39e22db7adb6f)

commit bd82be73a578595f1ff8b3d81832bbde237023c9
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Thu Feb 2 23:33:24 2012 +0000

    i18n: Add more languages for selection
    
    Add languages above 30% to the Win32/Mac list.

commit 5a8b5de6f933b8c29da07eed8e65f04f92d22fc9
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Feb 2 01:42:54 2012 +0100

    Handle MKV segment change properly
    
    Don't use the var_SetTime hack anymore and don't flush the fifo when
    it's not necessary.
    Fix #5967 and #2855
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 87ed819bada9492bc4b2e6e0ff2859797946edf5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 966bb1d8c50c8145285bd75ec0eab17dc8267f90
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 2 22:26:55 2012 +0100

    Qt4: pause on minimize is off by default
    (cherry picked from commit fcbcea1df9e93948d43aad2cf4511f81042fc9b8)
    
    Close #5975
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3af824fcb5e6541d8dc497aa88dd0f0ebd2bb817
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Feb 1 20:25:05 2012 +0200

    DirectSound: do not initialize volume twice
    (cherry picked from commit 8b970ddcb0472d2d19fd8f3136be022f1b52278a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a4eca1f08a1cc067386b9ff431b00d88dc9a1929
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Feb 1 20:24:17 2012 +0200

    DirectSound: do not disable thread cancellation
    
    The thread is never cancelled anyway.
    (cherry picked from commit 1ec3a5262ea053f7d96e00a4b38539176e628a16)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a5be967313b523cd0eb8b935a5eb4cb432772698
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Feb 1 20:33:07 2012 +0200

    DirectSound: fix double free on error (close #5966)
    
    Regression from 6d90bf20c01db2b284a81b26ce3356536257c1fc
    (cherry picked from commit 9eb9a10ebaba458575de38941a0f002ea79bbf60)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 857038adb6aff846e31d0ee88e5b0589e40d6a59
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Feb 1 20:23:20 2012 +0200

    DirectSound: merge memory allocation for sys and notif
    
    This removes one error case and simplifies a bit.
    (cherry picked from commit f09289e8b2759fb02bad580c3a47d305f3ea1fc3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7a8513523f0237ebd33494d5be3283fcf4063b77
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Wed Feb 1 12:17:56 2012 +0200

    transcode: user ENC_FRAMERATE_BASE instead of fixed value
    (cherry picked from commit 452cf1c4060c4917e546cae816918e0219e5dd31)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8d3330a17e8083c702470b8cb61fa5e2f07e1765
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sun Jan 29 13:17:58 2012 +0200

    transcode: add likely/unlikely in video process
    (cherry picked from commit 2b60e75b567d3aa9e980fe099c33ff1a033797dd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 29a10bd927360efc4569d646c5d58b2f5cfec2e2
Author: Denis Charmet <typx@dinauz.org>
Date:   Tue Jan 31 23:58:00 2012 +0100

    Avoid infinite loop if eof happens during buffering
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b178857361093686ff1844d8405f7560778e90f0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58246544310211ad6d2370ff1e17c8c00d50d080
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Feb 1 00:41:48 2012 -0500

    win32: install mozilla plugin by default
    (cherry picked from commit a12ca580c66127ea99fd7dc47c42c636a5dd5b75)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 07e657f5002837f2868c2a0334fc77ac1abef486
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Tue Jan 31 17:39:18 2012 -0500

    LuaHTTP: Use binary instead of ASCII when serving rawfile
    
    Close #5949
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 97111d1dbb62f64ab63a36c3a47c1cd166fe3c22)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d179194713019a608f4493feb9a34f5107d44b88
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jan 31 23:44:03 2012 +0100

    Lua: provide descriptions for submodules
    (cherry picked from commit b2393f00b7518b98de92537c1fbb481be97e35ac)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9d83faefd059a710748e735235a0d2dde8f7d868
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jan 31 23:22:00 2012 +0100

    Consider lua in the Main Interface category
    (cherry picked from commit 0c60f1a718fe054794c8bce02b87cffa82035bfd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f9adddf1ebdd4b15bbc676eaa2f42d4b8c37fd1d
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 23:39:48 2012 -0500

    OSX: build relocatable VLC.app by default
    
    Use VLC-dev.app when developing and rebuilding frequently
    (cherry picked from commit a80cde4daa41fee1fef3acd6d26d0c15f503a318)
    
    Conflicts:
    
    	extras/package/macosx/package.mak
    	projects/macosx/framework/Pre-Compile.sh
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 2528cb4fdb94999865976533ed3c6140712dd5de
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Jan 2 19:47:11 2012 -0500

    VLC-tmp.app : remove .app suffix
    
    It doesn't give an OSX application
    (cherry picked from commit ffdd8bedfe9dc865236b196739a7614aa2867b91)
    
    Conflicts:
    
    	extras/package/macosx/package.mak
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit b998e6a28c32989d1b39d9afd3842bc2b4e1ceea
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jan 31 22:08:23 2012 +0100

    Lua: fix existent sd loading
    (cherry picked from commit e0eb0da89ad97f609b785643804870d9b42659a3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bb54273e8ff796b20130617e07f07249d4ba77dd
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jan 31 18:59:36 2012 +0200

    tdestroy: use assert()
    (cherry picked from commit 2b268061a42125e7ce79d63e42ce0cc2dd9c720c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8c6f1380248811d620a37315a24a3080b1a848a4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jan 31 15:20:40 2012 +0100

    macosx: prevent AppKit calls from threads which aren't the main thread (fixes #5779
    (cherry picked from commit 861c0e2c81032594ac05e0f36b1b1e4d5f535ab6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f7f2bcae94482df5b4aabed309160fc02ad20b24
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jan 31 12:53:38 2012 +0100

    Skins: fix compilation with zlib 1.2.6
    
    Close #5964
    (cherry picked from commit 18173044cdaa1fce6652614b893054d792f4e258)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4615f68fcdc6f0cb0051cc885217f83445abbad1
Author: Sébastien Escudier <sebastien-devel@celeos.eu>
Date:   Mon Jan 30 15:15:28 2012 +0100

    live555 : fix http retry
    (cherry picked from commit 4bc2de8cfde1d55d6e605fb79cffc14e36ec1bb3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 82b414b1cef5efe436ced66e0a886f2501098883
Author: Dean Lee <xslidian@gmail.com>
Date:   Tue Jan 31 00:35:12 2012 +0000

    l10n: Simplified Chinese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit d8e2fcb74c52589d7c0c9ea292c6b96f7e1a6728
Author: Alexander Law <exclusion@gmail.com>
Date:   Tue Jan 31 00:33:21 2012 +0000

    l10n: Russian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit aa11eb7b2866c0772ad90815d265cc3741487650
Author: Sidney Doria <ssdoria@gmail.com>
Date:   Tue Jan 31 00:31:57 2012 +0000

    l10n: Brazillian Portuguese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit e03a197c59c86a5488b92d8cca3516dd0dda50b0
Author: Mindaugas Baranauskas <embar@super.lt>
Date:   Tue Jan 31 00:30:32 2012 +0000

    l10n: Lithuanian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 7d181f5004dedef0c49fc556bb2968c40e8470dc
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Tue Jan 31 00:28:05 2012 +0000

    l10n: Japanese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 235b108de4bf275b8d6d3ba02bef97489f21b75b
Author: Ivo Ivanov <bestran@mail.bg>
Date:   Tue Jan 31 00:27:01 2012 +0000

    l10n: Bulgarian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 2d3123c0353779c61e96b4f79d225615f70591ed
Author: Brad Smith <brad@comstyle.com>
Date:   Mon Jan 30 12:52:47 2012 -0500

    Disable OSS support on OpenBSD
    
    Disable the OSS support on OpenBSD by default.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 460cdb561d091da9f181141b2a8203c737290679)

commit 2005c7ddad80440aa943b6eb8b21d49aa9a68907
Author: Brad Smith <brad@comstyle.com>
Date:   Mon Jan 30 13:49:07 2012 -0500

    Fix up *BSD handling in Operating System check (for 2.0)
    
    This fixes up the *BSD handling within the Operating System check.
    SYS is now set to the OS without the version attached as provided
    by ${host_os} (.e.g. openbsd instead of openbsd5.1) to match all
    the other OS's and simplifies other OS's checks further down. This
    also allows the script to recognize DragonFly.
    
    This is back porting 4bee377fec3a95fe6681b0af3517f38064c336f2 to 2.0.
    
    There was a typo with the initial patch.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 22220ec5039331067a13cd84deff2e85cd82a3ec
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jan 3 18:35:02 2012 +0200

    Remove dirfd() hacks
    
    (cherry picked from commit 38227c2441ad80bbf000f3a5fda40f5ca1dd6e3d)
    
    Conflicts:
    
    	compat/dirfd.c
    	include/vlc_fixups.h
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit 87b5f8f6c1cba05b4b549587988e0553482ea7e2
Author: Brad Smith <brad@comstyle.com>
Date:   Sat Jan 28 17:05:37 2012 -0500

    thread: Simplify vlc_GetCPUCount / add FreeBSD/NetBSD support
    
    Looking at the current vlc_GetCPUCount() function this can be simplified.
    The sysconf(4) variable _SC_NPROCESSORS_CONF is available for OS X and OpenBSD.
    The change as is also adds FreeBSD and NetBSD support to vlc_GetCPUCount().
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 3a50918d89ebd66d43af99b8750fe8a1558f8b92)
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

commit a544bcab5d0012485050078ed9f1a0f36f5202c4
Author: Brad Smith <brad@comstyle.com>
Date:   Mon Jan 30 02:58:38 2012 -0500

    Fix libpng checking on OpenBSD
    
    This fixes the libpng check on OpenBSD. Although the code was passing libm to
    ultimately link the library the test itself was not and thus failing. Also at
    Remi's request I changed the existing and newly introduced use of -lm to $LIBM.
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (cherry picked from commit 900041eb4d79eadc51a32c879fbedfa6262be767)
    
    Conflicts:
    
    	configure.ac

commit ad3d26bf3d02161b10dbf03a6df2450477b3a793
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Jan 20 21:33:45 2012 -0500

    compile: don't escape &
    (cherry picked from commit 5a5559dfcde0c1b9a5feb3a3831f460a5f82d21e)

commit 56b900c0b93dbd084cb32e00dd6dc21c411119df
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 21:42:27 2012 -0500

    Simplify MAKE detection and ./compile creation
    
    Clarify what ./compile does
    (cherry picked from commit 468e5ea3ff71fd453a2c0b05e4f5f90597226f27)

commit efe42251c6b9fe25985fefda67d9bd5da3af391b
Author: Brad Smith <git@videolan.org>
Date:   Sun Jan 29 10:30:03 2012 +0200

    rand: Also use /dev/urandom on OpenBSD as well
    
    On older OpenBSD releases you especially should not have been
    using /dev/random, nowdays due to changes all the device nodes
    are actually all the same so either way this code can be simplified
    to not special case OpenBSD in vlc_rand_init().
    
    Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
    (manually cherry picked from 3fc4af487dc23113a3c9602e1022f464f3992601)

commit 46c54854d319bc596ffc0cb33f5ff7bcce38cbba
Author: Christoph Miebach <christoph.miebach@web.de>
Date:   Mon Jan 30 11:26:26 2012 +0100

    german translation for 2.0
    
    manually merged and manually corrected wrong file encoding leading to wrong symbol representations
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

commit b51f9aaaf0af7daafe27e327af74d578f7da46cb
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 4 18:59:51 2012 -0500

    plugin support for "other" system (non Linux UNIX)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8d12038f945bb965b50eece8ceca77c856b15694)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit e5371ce2a380d8c3ac74fb3b640970bd43fa46d2
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 29 23:47:36 2012 +0100

    Qt: make playlist font less small by default
    (cherry picked from commit 987c2953afaed2217e012ba02e3221b7d2963d27)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2065847b71d109a38c592c4540039e0831c07e5d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 29 20:53:54 2012 +0100

    Qt: use a less small font on mediainfo.
    
    It seems really unusable on win32
    (cherry picked from commit 2d96c40a5ad6ea23c74a55ffb1091afda7b7f724)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bd8116f9e678f2fd2e80f5fc10826edcdb04d927
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 23:44:29 2012 +0100

    macosx: fixed potential crashes when localizing strings
    (cherry picked from commit fb5766e398fa651791f5b7b7071a04ec175d9e5f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2d65af49da60e34ea2903e7c673d723b6e5b0ce2
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jan 29 22:03:24 2012 +0100

    macosx: implements user choice to autosave volume on exit and changes volume slider range to 0 ... 200%
    
    this adds the configuration variable and also the respective gui modifications for
    simple prefs dialog. Also, this commit changes some spacing in gui to be consistent
    between the different tabs.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit c2e39623ffa829913be56ad2030f507ba0470d35)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 90f526199df6200b0892ea4fca33b168903f0d66
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 20:49:08 2012 +0100

    macosx: enlarge the main window's drop zone caption to make room for the French l10n
    (cherry picked from commit 525413129bafd487b1b8e9bad39b6ce03c5264dc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 67394cf1dd995e1b10b199ee5c5cda70bdb6743a
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jan 29 20:31:02 2012 +0100

    macosx: unblackout other screens on lion as well, when leaving full screen
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 9592e9cfd44b727011d8f6d88bcd7c27b0b36ff8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c6775ab91ad00b8e574cdd5936967d19a00b1ccd
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jan 22 22:41:22 2012 +0100

    macosx: save the current volume in intended variable
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 4a869d394f8e3423b3bbade4f96100723748d4b1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 709c63dda84a2db4f537d7d83ce986501a04044d
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 29 19:14:42 2012 +0100

    Win32: Use CRYPT_VERIFYCONTEXT for vlc_rand_bytes
    
    Since we don't require access to persisted private keys
    
    Manual cherry-pick of bf36bb2935555aa9b2e36576677fe62b1d2bcd94
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fce8e21cc78b12a15d54864e54812c0fa8f1ee86
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 29 18:21:27 2012 +0100

    Qt: Media is uncountable.
    
    Close #5947
    (cherry picked from commit b416098094451b79328766fd8408698ba2aba122)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fea63b429791c66809de92e0c2c1360b993907da
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 14:52:57 2012 +0100

    macosx: fixed use of [VLCMain localizedString] pointed by David Fuhrmann
    
    this fixes the l10n of the advanced prefs and a few other strings
    
    note that this facility is broken by design and should be replaced for 2.0-next
    (cherry picked from commit d285961c0b2422c8c5e7af0109263064ec8443d2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ea576ff7f02bffa6657b0b57e47986dc9b56475b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 14:31:48 2012 +0100

    macosx: fixed l10n of the 'Extensions' menu
    (cherry picked from commit 41d7819dac04b9641d3d0b9e89c056fc72260404)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3c4de5d773cfcb7bea0b2322322ec0dc154f7999
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 14:24:24 2012 +0100

    macosx: small interface modifications to make room for lengthy translations
    (cherry picked from commit f8014070524dee08f9fc3a69c5922ae19de8bdbc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6ef0cf377a5365a70bccf18c423aca1f5e6a2b49
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 14:23:49 2012 +0100

    macosx: displayed ocalizable sstrings correctly
    (cherry picked from commit b3807154b3fa4b90a5570549a5e1a7eff6cedd49)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dd39bba006417f612599ee13bc77874185943d8c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 13:58:03 2012 +0100

    macosx: fixed execution of binaries linked against the 10.7 SDK on 10.6
    (cherry picked from commit 49972383e28d67ebd9657d9101f77b2216aeb24e)
    (cherry picked from commit 89c3a705cec6568f98ae70eec998ab9635078466)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f8db06d317077870b4081a8467ba0d6c4378ae19
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 13:32:28 2012 +0100

    macosx: fixed broken appearance of the main window in case it is linked against the 10.7 SDK but run on OS X 10.6
    (cherry picked from commit 4a646775222b9645f6d3a522654aa89542051116)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e27ad0a40fd3c66f6dbf3049e743ca63a30f3099
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 05:09:51 2012 -0500

    contrib: libvpx 1.0
    (cherry picked from commit 0c7696c1dd4bbae4edab5622e53e5605734cb169)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4dc62d8e864f17185583c20b00c8991a42f994f5
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Jan 27 09:12:21 2012 -0500

    vpx: fix FreeBSD build
    
    Change bash location if it isn't in /bin
    Use 'linux' OS
    
    Patches inspired from FreeBSD port
    (cherry picked from commit a2b6035db7c1398568b669b33f403fbf02cde724)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2714a7dc29e7fdc4bba91099719d46c24e77e8be
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 01:51:19 2012 -0500

    dca: only build library and headers
    (cherry picked from commit 4d338f69d808d98cdc59a61b2c4a541c920a61ca)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0a421df1cece46a41ec25b9507721345b9cc5930
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 01:51:06 2012 -0500

    dca: update config.*
    (cherry picked from commit 6df79d9c7278855671061a17825c8d2b350b761d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ed0be777aae933a978be75b6471741c887497ad1
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 29 01:43:18 2012 -0500

    speex: arm code is for fixed point only
    (cherry picked from commit 083c69e0407255b5596b4cf3dc182f09f76a7d83)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fd433550afd7c0fbd826910d86e1274154becb60
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Jan 28 21:52:04 2012 -0500

    avformat mux: don't write trailer if writing header failed
    (cherry picked from commit 62229a3b5c564b9d3c6401fe731a70c4504e6f14)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c058582a1cb052009a1521fa2ab0c5f9c1282e91
Author: KO Myung-Hun <komh78@gmail.com>
Date:   Sat Jan 28 22:42:05 2012 +0900

    Compare a filename ignoring letter case on OS/2
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 066c6231575901d22e4750273b6e82bf85f7f061)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 182637bfc37f95e2a78f5d00f8836b8f0553d064
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 29 03:21:31 2012 +0100

    de.po: some minor translation improvements

commit 046f33df26d269cfc1216ea2f4a2284436f372c9
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Jan 27 23:09:03 2012 +0100

    thread: Implement vlc_GetCPUCount for android.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 739f1233633c09f7095c1d53c85b65307e58b7fa)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3ea86160a2670247da007603d2f681a77bf6c71b
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Jan 27 13:03:08 2012 -0500

    contrib: fluid: Don't use inexistent files
    (cherry picked from commit d56a52e263359fa8aadbf8cb0e1b9aebb2ae6ff2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 25a6c75b57ef09c829cf2fca2af3cd5e98a1c3a7
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Jan 28 12:39:14 2012 -0500

    contrib: make HAVE_FPU check consistent with vlc_cpu.h
    (cherry picked from commit 7a7f12fa3256a4dd58b46e9f16fff9700a574edc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5df0244d5667e180f8ee0677d448031afc6decf9
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Jan 28 12:31:26 2012 -0500

    contrib: vorbis: fix inverted HAVE_FPU check
    (cherry picked from commit d31d221b21df2a1b38e1dc2e95f2b8f12aac8db2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c7ebcfe4696f3cfc9d2d4eb190d9a5aec0d37575
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Jan 28 17:35:49 2012 +0200

    Qt4: missing #include
    (cherry picked from commit d54154d54fe49a986e4a5a77ac03bc491253058b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 322b03f0d569dae01a32c475ff901f8f0878eec7
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Jan 28 16:24:43 2012 +0200

    dash: include <config.h> in all cpp files
    
    On Win32, time_t can either be long or long long depending on #define's.
    This caused linking failures.
    (cherry picked from commit bf4a19392af196daed81a3887d5b2ef088e3cae9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 61426c7c15b879c8fc51852d1e77931a88cf6727
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Jan 28 13:00:25 2012 +0100

    Contribs: use latest commit before lavc 54 jump
    (cherry picked from commit d3b37eef0ef3d5923d1e39fa150d0ebbffe94a88)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8d26a0e70ef8de7c8e6cf60efc429a3405aad990
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Jan 28 13:25:04 2012 +0100

    Qt: fix open dvdsimple.
    
    Close #5935
    (cherry picked from commit 4b77fc558acc1d5ff3fa80e0dd807d08284fac62)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 74e6c03975a71d4ad87c8e528fa4734348f086db
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Jan 28 13:14:53 2012 +0200

    Remove plugins.dat on uninstallation
    
    (cherry picked from commit cc40da808d48e63a8df483b00689ddfe70e74a21)

commit c762db911902c45a8f69bf424b1ccd1ce6903e1e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 27 23:57:59 2012 +0100

    Configure for android: disable more modules for smaller size
    (cherry picked from commit c34cf2f36749661c97039f47a86e092f3679d35f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 42d0d4454bf3357f7774d24e15466d0c6ac1dd4e
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Jan 27 22:55:42 2012 +0200

    blend: fix Win32 warning; RGB is a system macro
    (cherry picked from commit 31c91f0a8f61ddb0b30cc35c42feec0ef3abd1e4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a0ca2ab7298ba9470237489b9d8a616d5f9e68d3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 27 19:49:12 2012 +0100

    Contrib: avconv was removed from FFmpeg
    (cherry picked from commit b87a34a7cc6d2253a97943604cc337a1416b9947)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dbdc6627c8506b68a6044c51d286b235cb882242
Author: Rob Jonson <rob@hobbyistsoftware.com>
Date:   Fri Jan 27 12:52:26 2012 +0000

    add execute flag to mac os build.sh
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 6dbbc2aad04d43bcaaf488b3fba7821ea3fb454d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93ebac271fcd9f7dd09856120440ada2a987ddb4
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Fri Jan 27 18:04:17 2012 +0200

    GnuTLS: allow x509 version 1 certificates for CAs (and only CAs)
    (cherry picked from commit d6a7a4d7e979563efd6322bf582a4aeea61b4d56)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 95e32e3e50739778e713b9b768a12db889328121
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 27 10:50:41 2012 +0100

    macosx: improve reliability to detect text field content changes (should finally fix #5862)
    (cherry picked from commit 7b5c4c3fc8dfbcbbdd00f68a23998af11ed30046)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2f59334a27e85face0048d0147f7d18c61229e1b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 27 10:35:22 2012 +0100

    macosx: fixed 'intf-show' and 'intf-toggle-fscontrol' hotkeys
    (cherry picked from commit f78f3ae2873fefc52f67d84e7c1edb6c520c2271)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ec30ee5d46fae158ce7ca4026368f6536347a103
Author: Martin Storsjö <martin@martin.st>
Date:   Fri Jan 27 10:32:22 2012 +0200

    omxil: Ignore OMX.google.* codecs
    
    These are sw codecs, mostly the same ones that earlier were present
    with names starting with OMX.PV. They don't work properly with the
    vlc omxil client code at the moment. Using them doesn't have any
    significant advantage over our own bundled sw codecs.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 94d0697da224b6f9bd41df49d6a221b36d0acbbc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 75755f42816a13665d1c8c60d9cff8dd5c4e49a1
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jan 25 18:00:10 2012 +0200

    ARM: detect VFP floating point unit
    
    This sets HAVE_FPU correctly on ARM targets if VFP instructions are
    enabled. Note that __VFP_FP__ implies the use of the VFP floating point
    format, not the availability of the VFP instructions. Thus software
    floating emulation __SOFTFP__ (i.e. gcc -mfloat-abi=soft) is excluded
    explicitly.
    (cherry picked from commit cf5a82224a3db25ed078f7d441257da51b346990)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8b148da32117d1db8c7ec624ed10351423cc8bd7
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 12:10:00 2012 -0500

    Neon yuv->rgb: check if CPU supports NEON
    (cherry picked from commit 14b6dc70ede19e0b5bbf7652afb053966a7c6610)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5221a77027696d4a38e815f0f92f4b62f2431bea
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 13:27:02 2012 -0500

    neon yuv->rgb : check RGBA order/endianess
    
    We only support ABGR
    (cherry picked from commit 99bf74390c5a44d0a9199881c7ddee752c613d5e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 617106df879fb57222496e8c8b312dcd61f0cd94
Author: Sébastien Toque <xilasz@gmail.com>
Date:   Tue Oct 4 22:38:36 2011 +0200

    YUV->RGB convertor in NEON
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 6983b2f386678ebc9554e334b0d5622f301c0c35)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4ee436f7aa3c6a65bd9e5654746cdf29c431449a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jan 10 11:48:41 2012 +0100

    compat: always compile getdelim on Darwin
    
    same rationale as in 679830ea6062dcfb7184c084f5787a8b6f436a3c
    (cherry picked from commit 084beb155c04a4e56b98c366bc6a1bd3d156ff17)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8ab6e44a73a601db8a3912b5814a538fd90602e1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 27 02:18:46 2012 +0100

    Avcodec: Fix slice-decoding of hwAccel + -mt
    
    Close #5909 #5867
    (cherry picked from commit f86e5ebbc95af8c0bcb8bcaa9ea6407fa69c0765)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 509ff4ee3a295930d4f87a02e2cb836f9f2f969d
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jan 10 00:50:13 2012 +0100

    fixups.h: added an explicit hack so binaries created on OS X Lion can be executed correctly on Snow Leopard
    (cherry picked from commit 679830ea6062dcfb7184c084f5787a8b6f436a3c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bd759ad724de46a139651879dc5df58a4756e463
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Jan 26 23:58:33 2012 +0100

    Preload local directory for mkv only when needed
    
    The option is now default enabled to be as simple as possible for the end users.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a1ded9a83ecff24af9daca923d9672be76f5cf07)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit caf2a08a0507ab9e9ae34038854f3f218e820581
Author: Martin Storsjö <martin@martin.st>
Date:   Thu Jan 26 21:59:57 2012 +0200

    avcodec: Set time_base for audio encoders, too
    
    This is required when encoding audio in libav 0.8, otherwise
    it will crash due to a division by zero.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 25fc1243b81a46a100e37db5ec477bd5096b979a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c2c945cb5ce68bda9eb9af58d9a17fc365dfc4ce
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Jan 26 22:55:16 2012 +0100

    Allow Ebml elements bigger than 64GB
    
    Should fix #5919
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c8b78f40656684c8b55fbd059c37850e2d0a3e41)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e3d70d0fe312fe0b13fe77a81cf8c8f8b14d2155
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jan 26 20:46:38 2012 +0100

    macosx: fixed slider knobs in the black ui style
    (cherry picked from commit dc3430bd7b87a601770efa46eacc71719c2778f9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3fd82b92b438f76fa6509713fc24fc7aa1eb8471
Author: Tobias Güntner <fatbull@web.de>
Date:   Thu Jan 26 03:22:18 2012 +0100

    Qt4: Use the width of the new text to calculate the tooltip position.
    
    Signed-off-by: Ludovic Fauvet <etix@videolan.org>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d8ed5645a0835a2fa9b65513555cc958ccee6197)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d6e7d4514e98655ae494df033f01269e66c04bf2
Author: Tobias Güntner <fatbull@web.de>
Date:   Thu Jan 26 09:30:45 2012 +0100

    Qt4: Test the correct text.
    
    Signed-off-by: Ludovic Fauvet <etix@videolan.org>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 85b39d9d430bb84ef734c341f688c368782badf0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2855320a5abab4a7a730161ac671a7c993668ee5
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 04:00:46 2012 -0500

    logger: don't use NULL FILE* on android
    (cherry picked from commit 8d2f07b0b9716aac58d0c294371cb8147589ba19)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ec5d9cb08672f4a1e27d413644556d49c8feccfb
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 04:00:00 2012 -0500

    Revert "logger: store in the context which logging mode is being used"
    
    This reverts commit e50cfac2d3cbc00abd7d332eb47abb584ef5eac4.
    This undid modifications made in f83d51d4b16a939d9b308a47b1b08db69917af68
    (cherry picked from commit 091552e8ad1738aaccb1e930d39fcb13df113114)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 136d91e8ed648c12faf6be18226e88f3696616fb
Author: Martin Storsjö <martin@martin.st>
Date:   Wed Jan 25 11:22:17 2012 +0200

    omxil: Set the module priority to 0 for iomx
    
    The iomx module is only enabled when the user has requested it
    (via settings). Currently, when the iomx module has priority 80,
    it is always preferred over avcodec.
    
    For other platforms, where one would only enable omxil if one
    explicitly wants to use it, this is ok, but for android, we
    ship the iomx module but allow users to enable it at runtime
    if they want to.
    
    If it isn't enabled, the priorities are currently overridden by
    adding "--codec avcodec,all" to the command line, but this makes
    avcodec have precedence over other decoder modules that otherwise
    would have higher priority (e.g. a52).
    
    By setting the priority to 0 for the iomx version of this
    module, we can more easily enable it only when asked for,
    by adding "--codec iomx,all", without affecting the relative
    priorities of all other codec modules.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d64ca8acaa6f2bd9db57b4b25446656a30bcba2f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d417550f2c2c8b25f4b33ffade524d9334419111
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 01:43:15 2012 -0500

    logger: store in the context which logging mode is being used
    
    Don't close a NULL FILE* on android
    (cherry picked from commit e50cfac2d3cbc00abd7d332eb47abb584ef5eac4)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 954295dcce2e4f82f5ac5ca3aacf68b9f71f7d50
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 01:38:32 2012 -0500

    logger: cascade if/else for different modes
    (cherry picked from commit 2e86bc8f278a18d7be6d0d2d8a00505ed24efba1)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 7b002b05639de4adbe58bf8365eec104242cd213
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 01:36:40 2012 -0500

    logger: move Apple related define where it is used
    (cherry picked from commit 7c6abb20451f26a175eebc426960f30afa440c72)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 32b662e4662fe5e132ab6e0aee7da9220110082e
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 01:36:17 2012 -0500

    logger: remove unused defines
    (cherry picked from commit 9acc769230e1fab55bc9d22e8accce6c9f66b0ae)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 73967c45b7b5d297c66da033e6ea3ba0061378ac
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 24 23:45:09 2012 -0500

    android: configure will fill PKG_CONFIG_LIBDIR itself
    
    don't make it point to a wrong location
    (cherry picked from commit 56018495fb0f8d6258fc99da599f2d2aee0e1011)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 9c8a32f4de9c4dc0231741c5dc95de9c3531ff2e
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 24 23:43:08 2012 -0500

    android: remove workaround for old ndk
    
    Give the real host to configure
    (cherry picked from commit a2fe52949ec26f1e35f9a83f26e9ae01d7a2efab)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit bfd1e2bf3a0ccd740a6a4cc98005a64ef07512d8
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Jan 21 07:08:10 2012 -0500

    android: build with -g
    (cherry picked from commit c16d79969fec549f45f4b063aebf8710f2db1cfb)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 2a4208b5cd7579fe8b412f8ca215a646811ae35a
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 19 17:05:06 2012 -0500

    android: build live555 plugin
    (cherry picked from commit 7edf187cc653555ecdd0186fabca30e1e9bc9575)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit ef43d6b2386484d3eb61fb99d1a5cf6145c0e40b
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 24 19:09:27 2012 -0500

    contrib: ffmpeg was removed from libav
    (cherry picked from commit c48f8460bb5911e8436825adbaf707a3b33c3558)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit d7da94f8e42fe96e7dedb7062af82e5efe2d514c
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 24 22:43:07 2012 -0500

    contrib: live555: don't match just 'ar'
    
    It would replace the 'ar' of 'arm-....'
    Instead use "LIBRARY_LINK =.*ar" to be sure we replace the correct tool
    (cherry picked from commit 2a8e01dda3d9bcf9328623bdb2194f2d4c2d9c17)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit abd3163a1f299dd881eb64aae486f0f7f185433d
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 25 00:14:26 2012 -0500

    Revert "Android: hack to fix warnings in pthread.h when compiling in C++"
    
    This reverts commit 1a1bba5a3da60b1433509f54375f0c12db22b3c1.
    
    Conflicts:
    
    	include/vlc_fixups.h
    (cherry picked from commit 3437e616aea5bad334b1a304d2af0c239415f922)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>

commit 9cc771b106c542f98535f41d7b70460c0465afd0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jan 25 00:34:47 2012 +0100

    Update PO

commit e4eb05a73013bfa2b65429ec8c3bb6eb270e44b5
Author: Martin Storsjö <martin@martin.st>
Date:   Tue Jan 24 09:27:36 2012 +0200

    omxil: Add a prefix to the iomx function symbols
    
    On some devices (apparently froyo and earlier), some OMX core
    (with sw-only codecs) already is loaded into the process, and
    dlsym(RTLD_DEFAULT) can just as well return functions from that
    one instead of the ones from the iomx wrapper that we've loaded.
    
    This makes sure we really get the functions we want.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 3c34f80809b89ebb581a76763b8c9e7f58568942)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3948a4b69a695b3c8fa913314de19706c676042e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jan 24 20:03:32 2012 +0100

    macosx: make sure the main window's position is correctly restored (fixes #5856)
    (cherry picked from commit d832507736d33cb435ba1830e9bdbace89a68c2e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 76bda07d81b3f43ae30738d0dc3ae19bf6eb999a
Author: Olivier Gambier <olivier@webitup.fr>
Date:   Tue Jan 24 18:15:33 2012 +0100

    contrib: live555: replace ar by our $(AR)
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit 2171af178491f01eeca2f7e5329d4e6cd3f78909)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 767ff82b747593068388b61384fc45a146fe372a
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Jan 6 11:25:47 2012 +0100

    dash: Removing empty IAdaptionLogic implementation.
    
    This is crash prone, and makes us maintain another implementation if we
    ever edit the interface.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f2eccf2960d08612083dbfa22ceefe8004141cf6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9ca785b7b03713d722a73e8d69dd767dc47b9d47
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 14:35:10 2012 +0100

    dash: Adding an implementation for UrlTemplate
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit db1c4aa7bcc4b94ec90a0217a52fa988304c0228)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3fff15a4c54028a9713281f2d99e6142baf4ef68
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 18:23:52 2012 +0100

    dash: Fixing SegmentInfoDefault parsing.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d3086feaa17f818ac945eba7d460fa8edb4688ef)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8b5f1ac1cccdc61528a98b6bdbedcafd5984212c
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 18:21:37 2012 +0100

    dash: Fixing SegmentInfoCommon initialization/deletion.
    
    This prevents a potential crash, and solves a memory leak.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 83b82fc3805b1217cb6204fc4f763550416f0de0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 26a54da31260618661c5818fef261de0ad9e6865
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 18:20:36 2012 +0100

    dash: Group: Fixing SegmentInfoDefault initialization/deletion
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit cb1d6223044b0accbe1500930efaef058baf25b5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 504bed780c6f46c936f539dfb69d6947b0e061f7
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 17:11:01 2012 +0100

    dash: Handle UrlTemplate in parser.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c4851d5ce5b5e8d83b4b5135de2d9ee475ce4d3e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f6e9ca145e6323da90d8f8664cba55b5f2b6847c
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 16:40:23 2012 +0100

    dash: Removing useless and potentially harmful recursion.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 2a6547a931e61fd117298662176e41751b5e197d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8d6ddd7000a8df9c32bd99c4ef1d4193e55229bf
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 16:06:54 2012 +0100

    dash: Don't crash when a segment can't be accessed.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 88dc675a805600c9d3464d3af0008afaee18ef3f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 13e968b41baab555d0afad81e6986603fc28377b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 16:03:27 2012 +0100

    dash: HTTPConnectionManager: Removing useless method.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit cbef7d0cda327a86455388af128949cca5a01012)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8bc4eab8a9d21eb89c5abcdd93eea181f2df9165
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 15:50:38 2012 +0100

    dash: For first segments, don't choose the lowest bitrate.
    
    For some streams, the lowest bitrate is an audio stream only. We will
    fall back to a more appropriate stream after a few chunks.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 73b30f553150be24f2fb523d629fba788d18646b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 694ae8e72ddd67953b49423e171bb838a3f5d1ab
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 14:53:09 2012 +0100

    dash: Cleaning Period class.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 98a01d40722a080842a7e85b2a657bd946a7ea14)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit de45860f99ff6e58f60642b61bf6b486635ce701
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 14:53:49 2012 +0100

    dash: Allow SegmentTimeline to be queried for a "S" element.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8158205e527712886aa05a644d508e406a024e68)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eaf97ac67a41dff33a611941d565e0f1189c7743
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Jan 5 12:20:47 2012 +0100

    dash: Handle relative URL
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a90c1374304a712b6329015132d3ce3956a6ea1f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3e6823521f37f2582d38583064211569538f10d6
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 3 16:05:09 2012 +0100

    dash: Store the parent Group in every representations.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit bc77d458c167012d56054404a481c5f328e1da3b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 50f97b3ec466ada916c8ce5693533809241d0787
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 19:07:29 2011 +0100

    dash: Working arround specifications ambiguity.
    
    profile is spelled once as "profile", and "profiles" a few line after,
    so we now handle both.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 5f03006307026c6fbb586a68e665360e9ae9ebb7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0a99eaa93e251f79cbfc7bfa6fa676dec4588aae
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 19:02:32 2011 +0100

    dash: Don't crash if we don't have a valid mpdManager.
    
    This will happen when the profil is invalid.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 13002a34e61624fdf1092083625d511e15c41b63)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ae05b43e59c2a9195e0521236b772e2c164867de
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Dec 30 18:54:41 2011 +0100

    Dash: fix win32 compilation
    
    (cherry picked from commit 2d31fd776f7717da77193d6a893b0d93c68f689b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 92c43bb6f045a701714aedd06ebc06f828b60dac
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 15:09:32 2011 +0100

    dash: Parsing SegmentInfoDefault & SegmentTimeline elements.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6502b3a0c8e16ec4f2216fe037b0a1bd82de979c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4468816d11570e7a5b8e01afb128d1e7b15381df
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 15:06:43 2011 +0100

    dash: Only use const Segments.
    
    Everything after the parsing step should be used as a const instance, as
    the MPD tree is read only.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6347005a9f86d2b546cc47dc17d02f4ab2780e85)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 39e8e11b9f7eeed6e38874d7349b96b69f55d0d0
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 13:50:27 2011 +0100

    dash: Adding an implementation for SegmentInfoDefault element.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f565072bb0cb35faede93318438c3ed9ca65cb6c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bc62979e9c7148cb4391ff0c2c406103662c18a4
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 13:08:33 2011 +0100

    dash: Adding a SegmentInfoCommon class.
    
    This holds common property for both SegmentInfo and SegmentInfoDefault.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 752a29f300592e6ebc32f7b659d2f42ea15554fb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 032156ee22f3a9c370075cc637705bc3bda983ce
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 11:58:46 2011 +0100

    dash: Implementing the basics for SegmentTimeline.
    
    This will be usefull when implementing UrlTemplate.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 580caf1111e49d2ba9fe3c76202b92f1db8a45d7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5f68d95bdd2a404c86831aa27b7be9aa1655f68c
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 17:46:22 2011 +0100

    dash: Reworking MPD tree building.
    
    First build a DOM tree, then compute the MPD tree.
    This should ease the pain later when implementing UrlTemplate elements.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 139175ef38c4a12a1ced914dcb043206830e21c8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 356cf412945f63a94568b5194425939d03d33dbc
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 29 13:19:53 2011 +0100

    dash: Parser: Ignore segments without sourceURL
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit fd8787137788fd24f2b9bb9890068d51e6f66a80)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 692fe79d54ee104f45c83af573c86bb2ad8d3d29
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 29 12:22:59 2011 +0100

    dash: Removing now useless AttributeNotPresentException
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7127d0c9c8e7519994daa7656c9ddd0d7a5f0278)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8cb5651435f0057519bac0e2a1ee9b20cef78c95
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 29 12:09:57 2011 +0100

    dash: Removing now unused ElementNotPresentException
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 45827b28fe75c1afeb09732b2cab6723adf4bf02)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6f07eccd8d2d91de927d5cc69b64ac65a2ab060f
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 29 11:27:02 2011 +0100

    dash: Adding support for Representation's TrickMode element
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 3319c47e0e13ecec81ea527c70d0ad71033a17c1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 18e70595f65640a48b3dd70486f8297fdb48cded
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 29 10:55:31 2011 +0100

    dash: Handling Group @subsegmentAlignmentFlag in parser.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 203307197dce5e750462d19bbf734dd010ee6ff2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 78822a604bee9d8dc0a08496d0a8755e414261fa
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 28 17:32:34 2011 +0100

    dash: Don't require the Representation @id. Many stream won't provide it.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4abd446913081747a509e750b5c7e494c4d7a471)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 41f7cecbe29a0c91480fd2ea8859d927b43f66ec
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 28 17:30:13 2011 +0100

    dash: Try to fetch mimeType attribute from the parent element.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9caf4cee157920d0f27fda86d9fe411a625a3173)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9006d3ca90b997ff559a3f8e9bb70e73f425fc42
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 28 15:51:53 2011 +0100

    dash: Removing useless using namespace;
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 699b4b50c9a05d77484321acbc5bda5925f0f3cd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a86490a48f619d51f616d94dad1e5ea46dbe84ce
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Dec 30 17:37:51 2011 +0100

    dash: Reworking profile handling.
    
    Adding Full2011 as a supported profile.
    For other profiles, do not instantiate a NullManager.
    Return NULL directly. This saves code and prevents us from maintaining an
    extra interface implementation.
    Also it prevents such problems :
    http://forum.videolan.org/viewtopic.php?f=13&t=96335&p=320162
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a640bad9819dad53ffa74a4776ff33bd75c47f6c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3f790f57d7cfefed4dd38ee97667b16dc8cc6418
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Dec 25 20:26:10 2011 +0100

    dash: Handle parsing of ContentProtection, Accessibility, Rating and Viewpoint in CommonAttributesElements
    
    All of these fields are of ContentDescription type, so
    ContentProtection, Viewpoint, Rating and Accessibility classes are now
    removed in favour of a unique class.
    Moreover, the SchemeInformation is defined as a string by the standard.
    Therefore, the SchemeInformation class has been removed.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e16536dc6a14f3d095ab9b80da7277dd26cde21d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ecfa2b89cba290ffce7ab514a4c6558b6987f045
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Dec 25 01:11:52 2011 +0100

    dash: Don't use the module when MPD parsing failed.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 993077b724bc768345c870f23086bde3c9fc5e9e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f36d6273bf67f2da64888e846102b095d2d8a443
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Dec 25 00:51:52 2011 +0100

    dash: XML: handle text nodes.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 34fabb830ca5fcb4dfc39c39691a41715e72ab0e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 89c2aa13ad86fe68d833cbe8b7a145c3f4c62df0
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Dec 25 00:50:52 2011 +0100

    dash: Don't crash when XML parsing fails.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8ceecb115d38220c5653aa202ef0b28a3fc6605e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b247a3a61a3b465f5e15d4af662d7d484b3ce2c5
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sun Dec 25 00:14:23 2011 +0100

    dash: Reworking ProgramInfo parsing.
    
    Information are now computed once at parsing time.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 5457d47757f63d9d5716468e7148c7e4f41bf5ea)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 807ac284c8bda62dfd20c22a5a00b1b54385e58a
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sat Dec 24 19:14:56 2011 +0100

    dash: Reworking MPD attributes parsing.
    
    Mandatory elements are now checked.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a43d294f8371770f4425eb0f2e2a8ec29e1b2e92)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ce3925e9cf3fb23fe8bda6b75d464fe81bf3c8be
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sat Dec 24 15:30:28 2011 +0100

    dash: Reworking the way MPD profile is handled
    
    It's not the job of the DOMParser to compute a Dash profile. Let the
    dash parser handle it.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 04be885bb5b870d5f40b604ab0fa4d62b75040e8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 227e3c35225303bf5ef0039e21f798238a7f4d6b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sat Dec 24 15:02:37 2011 +0100

    dash: Reworking segments.
    
    - Don't differenciate InitSegment and Segment, as the standard define
      them as the same type
    - therefore, removing ISegment
    - reworking attribut parsing (to be completely handled later)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b996a750bc3ef7ae337e4f71a23ddbdf240522a0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 09ffaf1884fcff969ef8442db5ea5bbeddec3245
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Sat Dec 24 14:31:04 2011 +0100

    dash: Reworking SemgentInfo parsing
    
    Elements/attributes are now parsed once, and not everytime a getter is
    called.
    Also, mandatory elements are now checked, also at parsing time.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b412a1269212314e3e76dc1b0ee42e09164ad1b0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9db9d6b9c8575a4836a8142b93ce089d83bdb541
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 21 23:46:15 2011 +0100

    dash: BasicCMParser: Handle Representation @dependencyId
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8f9fd197f4df09c00bd7a5d06f8cadafd09cba7d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0af2e5c2c1845e5eaac3f3172acfe24f8fa2d2e3
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 21 23:34:09 2011 +0100

    dash: Group: Adding a getter for Representation by id.
    
    This will be used to implement @dependencyId
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 058904517b00e08409aadb8e8f1579c5cc602387)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f67415dd2830a66254d94d40193a3c073c4b8a64
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 21 23:31:21 2011 +0100

    dash: Basic CM parser: Parse some Representation attributes
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 3dab8a807627d9ba9274e4e6b12a54d599e9d44f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93049b0934584adb0d6e6aa7c3449a409020f85c
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 21 23:20:18 2011 +0100

    dash: Adding some basic getters to Representation
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 967fdaa471d565e2795e06f4b478389fa314c455)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 998ddf245da00aa3f8a2e478c4af955eefeccc28
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Dec 20 00:14:00 2011 +0100

    dash: Group element contains the "common" attributes/elements
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4a23e2fb48d2df3d5805bc6da8bc8bf2ea229d9b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d38bc3a09f450959c1171f1754c44e2d6fccd40f
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Dec 19 23:57:02 2011 +0100

    dash: BasicCMParser: Check for attributes at parsing time.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d2b3b80413ed152f77d376ffea9aa7605857ed29)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1ea33a1fdc6472597478226d3ec34bfdbe7edf8b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Dec 19 23:56:13 2011 +0100

    dash: CommonAttributesElements: Reworking getters/setters.
    
    This will allow the parser to interact with all elements sharing these
    attibutes/subelements.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 68024ffea8357053688f8e763f7fdc2c92779f6c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit bac93c6f9a06f53260e6e51f7a609d8df3a6bd41
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Nov 28 17:31:37 2011 +0100

    dash: Don't hardcode the isLive information.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 5cc04d06d766a9616f8b9bc8da39ed7c06df225c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 51ddaa77d3d6384147fe8c04ca4d4ca615fe9a09
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 1 16:55:38 2011 +0100

    dash: Fixing NullManager interface implementation.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 0a120d112e18f5cde5d57395dd36d18371365ccc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8aa98f8c743227b0d5f1fb113324a3d667734762
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 1 15:57:59 2011 +0100

    dash: CommonAttributesElements: When applicable, convert attributes to integers
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d314c4f4cac6d055e23a387f6aa2b741aec237da)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a8ce888feb5181dfb978f4b2cca5a2c5703aefc3
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Thu Dec 1 11:34:11 2011 +0100

    dash: Adding a RepresentationAttributesElements to represent standard's §5.4.3.2
    
    This will also save some code in a near future.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 7972dbae5aa3845762924c3dd65303546065cab7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 677c47565a714bd6ba62b8765cce4ae8bb7a8d4b
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Dec 6 13:01:23 2011 +0100

    dash: DashManager: Adding a getMpdManager() method.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f73b7ff2cfc92f80a3b1e2c4d9fc2e7bb42cd5df)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 012d50b9d9078ddd323f06f856fb779c4a1b6236
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Wed Dec 14 18:21:46 2011 +0100

    strings: Adding an helper to convert iso8601 durations
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 0b396ef1e6c2ec2bf370339e8df4a8790647eec9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5ea58c91c7314d9735598bf9c20f201207855377
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 18:15:41 2012 +0100

    hls: Don't crash if a segment can't be found.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 924a3408fd214f6d97ac829ff8ae6cde8e6a38bb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit efd36363e0b70f8a7b4340a8f57d34142c4f0168
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 18:12:08 2012 +0100

    hls: Removing useless assignments.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c51ff47e321aa99f5f77033d091ce6140dd46d7e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7dcae00f4d1b4ffa77f63891f0f824be17f76609
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 18:09:36 2012 +0100

    hls: Removing calls to vlc_array_item_at_index
    
    Using hls_Get and segment_GetSegment instead. Those check for out of
    bound access.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit d56ce5536ac6d4b583cf0d1ad462828cb745ca8d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5f5897cbb70c9e19d36d6f4a6aae1783c5d50f7a
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 16:39:35 2012 +0100

    hls: Removing warnings.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f180bd5f1a8d065cd9ae0ae0409d74f645b4df3a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit dc507fb8d9b01889334c7fab91219e1b33760fba
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 16:37:26 2012 +0100

    hls: Cosmetics: removing useless casts.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 833b0c760d3da2a5a2fc4da2acf87740b294ce73)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5bc01ff93bd031a6fafa83075ac6e4fd50bebdff
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 15:43:00 2012 +0100

    hls: Fixing a deadlock introduced in previous commit.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 75fbc4d4b792f5e4b40d6257ce1d6daaa810cc2f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7bafd5e57a078b318e2805a69fc5e4931e86ccc9
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 15:11:04 2012 +0100

    hls: Fixing playlist updating.
    
    parse_M3U8 uses hls_GetLast to update the HLS current hls stream, so we
    have to add it to the streams array before calling parse_M3U8
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e06362372ebb2e7d2a0ce0924703717807fb73ed)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f6399b2266787a93e074fb83bf96b732f7ae8598
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Tue Jan 24 15:09:55 2012 +0100

    hls: Fixing hls_Copy
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e618a5814917b1f966395ed3b45d1ca522a13692)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2fd6ea3acc8789698dd3c353d4c8937d60b5750e
Author: Frédéric Yhuel <fyhuel@viotech.net>
Date:   Tue Jan 24 14:34:52 2012 +0100

    HLS restore pos of current segment before seeking
    
    This prevents a "bug" when we seek backward and then play again that
    segment.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 982071198e54af320b684ac4bd319cc88caceb27)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 25775825be1c29cac635201c8b3c073b9aa8fd2c
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Tue Jan 24 12:22:36 2012 -0500

    macosx: Make streaming wizard output string editable
    
    Change the string's text field from static to editable, so options not in the
    wizard can be added. Uses the string from this field directly, rather than the
    stored string.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 40c5ee7f1b0b96fc964ea5a43ec41c0297a20711)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4df5d3b085fb9e08ef313a000419d551b75f234f
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jan 24 17:15:27 2012 +0100

    qtcapture: timing and speed improvements
    
    it respects the 'live-caching' setting now, is vastly more responsive and even got correct timing.
    
    Thanks to emi and Luca for the ideas and help
    (cherry picked from commit e0745f6002c5d0b20a552d98ab3e385798e68815)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d70a28c33b34604a62092321240473fda7599505
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Tue Jan 24 16:46:03 2012 +0100

    macosx: prevent warnings on console when opening the audio effects panel
    
    this were caused by an incomplete implementation of a 2.0-next feature
    (cherry picked from commit b2899779019541ef80b7385fc1dc7ef96a9ca334)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a9b1904817f230f10e3d5b4cc5d02cd8cbd0d457
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jan 23 17:41:57 2012 -0800

    macosx: remove outdated code
    (cherry picked from commit af197084313166e5e05ab609403b8eb3511b09f5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 859c2fd3dc58fc41c3ca4d3d8e3a5c80aaa73b56
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jan 24 19:08:42 2012 +0200

    Replace --disable-libv4l2 with --disable-v4l2
    
    This disables V4L2 completely.
    (cherry picked from commit fd8502cee82371a65b2eeeb230fbe63917bd84ff)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3917c663169218d4a72e7181d8f56326fb276a02
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jan 24 18:47:21 2012 +0200

    Revert "v4l2: check if kernel headers are recent enough"
    
    This reverts commit 5740099f6ffea9bc72f64ccd2870453e61ee77b2.
    This caused autoconf errors and besides I still do not agree.
    (cherry picked from commit f94107eb9ab0045116a901947141575ed53b199d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ed4095f4c9e51a10db974efc96b7614709ea9f90
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Tue Jan 24 18:52:04 2012 +0200

    Fix automake breakage in logger
    (cherry picked from commit 1f558cd6b1ca166d6d9dc6c29d900df010141b7e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 23df98e7772af2f77ed76df1092057df7bfdbf37
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 24 12:01:32 2012 -0500

    contrib: live555: don't replace cc 2 times for macosx
    
    we could end up with 'ggcc'
    forgotten in a6e2d06608df593af6118be34cc2f416d0c6d354
    (cherry picked from commit a9739cc0a5ffe72aed386d50b9a08c5cce75d481)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 233b642500252f95bb56e14a7f061e4f253299e1
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Tue Jan 24 17:00:17 2012 +0100

    Qt: fix MLModel
    
    Was broken since the pure virtual method getId() was renamed in
    the PLModel cleanup 4a61e6a8da6f138d9eb506229afffeea329f5414
    (cherry picked from commit 88ecb49beedf3a62133ef4d062ee2e350b604aa2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a66950cd58d333da976b205ff3ff284351e190ef
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Tue Jan 24 16:20:01 2012 +0100

    Qt: don't show Ml button if it does nothing
    (cherry picked from commit 8eb8d9419ba68664b34c8dbf200368b9b43b6485)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 675b8a35c633514acdabc1f32d88a7c29ed0f555
Author: Denis Charmet <typx@dinauz.org>
Date:   Tue Jan 24 01:24:49 2012 +0100

    MKV: Don't delete es at EOF in Demux() but in Close()
    
    Fix the second part of #5896
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 8e141adb83f3f8d40a141969890b0bff84757ab7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5d5a704a5b156cfd15836d9ce831f4994e486539
Author: Denis Charmet <typx@dinauz.org>
Date:   Tue Jan 24 00:34:10 2012 +0100

    MKV: Reset demux internal time when seeking to 0
    
    Fix the first part of #5896
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit ccb134a643baf9c9b60ae475198dddb57f107713)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4093516cbbed3c7a718f1ea32ce223d079a261eb
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Jan 23 15:05:33 2012 +0100

    hls: Trying to work arround streams without bandwidth value.
    
    A 0 bandwidth forbid us to seek, as the position would always be 0.
    This fixes one of the problems described in #5370
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 1f33a25ef2627b2b6411610b039f217dbdc3fb2e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit aa3d7a890470823f1397fbadde9d939e45ddd52f
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Fri Jan 20 15:23:11 2012 +0100

    hls: Don't fail when a STREAM-INF is commented.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 56a345ef6aa37e3f2b97931908e96b5ac755c760)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cef11dd919019de962fe3b2847dc5e3bfc73d320
Author: Luc Saillard <luc.saillard@sfr.com>
Date:   Mon Dec 12 10:56:38 2011 +0100

    hls: Fix vod
    
    Don't stop when playing a vod file without bandwidth information
    
    When a playlist doesn't contains any bandwidth stream or information,
    initialize stream->bandwidth to 0 (it's a unsigned number). So test will
    not
    fail when calculating if we have the time to download it.
     >> uint64_t size = (segment->duration * hls->bandwidth);
     >> int estimated = (int)(size / s->p_sys->bandwidth);
     >> if (estimated > segment->duration)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9ffcb9c5cfcb3145df309874eafbaf573581b32a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 88adceecf5da9d8a0050a704a64ca33ef2d28342
Author: Luc Saillard <luc.saillard@sfr.com>
Date:   Mon Jan 23 16:45:11 2012 +0100

    hls: Renaming Download to hls_DownloadSegmentData
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 1a89d92f2797f8b4afc6788b35ebb0a51c9568d2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d09ceb766b16c6bae737da8555c8f1297c6650fa
Author: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
Date:   Mon Jan 23 16:45:28 2012 +0100

    hls: Fixing some locks.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit bcbad8c70e309d03ec7dac57ee1f146f41948574)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8f89870d3a9b089e27e1a8e8e4445c6f33c192be
Author: Luc Saillard <luc.saillard@sfr.com>
Date:   Mon Jan 23 16:43:53 2012 +0100

    hls: Support encryption
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 04f73b95ae314d0b83c1e77411a290429418cd9f)
    (cherry picked from commit 00a0d57271b2945b262cc8ee0f81c0dfed0d9623)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cee57477b7da3a961706ea7f7b993bebbdfb7e4e
Author: Hugo Beauzée-Luyssen <chouquette@videolan.org>
Date:   Wed Jan 18 17:22:08 2012 +0100

    stream_filter/httplive.c: Various bandwidth fixes
    
    - Bandwidth is an unsigned int in hls_New(), so initiliaze it to 0 iso -1.
    - Do not calculate StreamSIze if bandwidth is not known, yet.
    
    Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>
    (cherry picked from commit be906d5275337481ac30469a839a10fa72f39786)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e744cca5017d423e11026e10efe89b6fe84b174b
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Wed Jan 18 16:48:52 2012 +0100

    stream_filter/httplive.c: Rewrite relativeURL (fix #4268)
    
    The relativeURL function missed various checks to determine the correct
    location for the next download. Checking not only the meta playlist locations,
    but also the HLS playlist locations itself should fix #4268.
    (cherry picked from commit 5de5d154d85ad7997d74e983c515ac6f6c23083a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1e39f64cbc1f4be87c2fd35fabf25630e525a987
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Tue Jan 10 12:14:00 2012 +0100

    streamfilter/httplive.c: UpdatePlaylist() actually lock segment when updating it.
    
    When an already existing segment is updated, then make sure it to take the lock.
    (cherry picked from commit 2ada723d2ad9682c7532690462ca4791b3290899)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f023ff2a78270560110a27742793e948f8b3bb7d
Author: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date:   Sat Dec 31 10:43:07 2011 +0100

    stream_filter/httplive.c: improve comment somewhat.
    (cherry picked from commit 632b205878d4bd0e92eb225ef9273b3bb20fc0a6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 66a176259b4c593a0ea7527477f950240cebd27e
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sat Jan 21 13:25:06 2012 -0500

    Add NDK compiler to PATH under Android
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b6471932b586db28a5337851c69e11a651ab2806)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b021b4e45c9dbe9ca8885cb6966a9b48f787c731
Author: Rafaël Carré <funman@videolan.org>
Date:   Fri Jan 20 18:35:23 2012 -0500

    logger: support android
    (cherry picked from commit a43414d06f78d2a6e7d5c87ae612c32b69bc6d19)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5e037a773bbda36a2bf9fba865b4db6bcf472c6a
Author: Sébastien Toque <xilasz@gmail.com>
Date:   Wed Jan 18 01:20:00 2012 +0100

    swscale: don't use SWS_ACCURATE_RND for RGBA on android, it's too slow
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 0fabd4d29e850700ce02bab507fe21a99371797e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9bbec8d48bdfd21ab858f96fa831331c0069a745
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 18 20:04:24 2012 -0500

    v4l2: check if kernel headers are recent enough
    
    V4L2_FIELD_INTERLACED_BT was introduced in v2.6.25-3581-g26d507f
    Check for headers from last supported kernel
    (cherry picked from commit 5740099f6ffea9bc72f64ccd2870453e61ee77b2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9dea2c6c32b5e17c956bbbb199518ca37fbacbf9
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 04:15:57 2012 -0500

    live555: add needed flags for android
    (cherry picked from commit 510ceaa45837d38361ca0fcced9bbd0f009d0352)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e1f83663e1b2d4c3b083a9b234b17d0e36a7f85d
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 04:15:56 2012 -0500

    live555: use our compiler
    (cherry picked from commit a6e2d06608df593af6118be34cc2f416d0c6d354)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 40531e0e6335f859d30ff75e4ece40b538670acb
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 04:15:55 2012 -0500

    live555: patch after extracting, before compiling
    (cherry picked from commit 341253eddfb02030c824d7972c41ed04631c31e6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1a8689119367ef91167d1da8338fbd41e013108e
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 03:57:03 2012 -0500

    contrib: live555: android: patch live before moving
    
    Fix error if interrupted in the process
    (cherry picked from commit d6411a2a2a3d7eba00b1aa78bcb7060181d43358)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 02fe18310fb218daf50a7bc2065890ca25e955da
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 03:55:59 2012 -0500

    contrib: live555: android: don't update config.armlinux
    (cherry picked from commit 1a4006ed1695eb8ca385bae15176b4fef974b931)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 37b5994b220cb6569cb6fc62443da1ec351873db
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 14:48:59 2012 -0500

    contrib: extend CFLAGS when using NEON
    (cherry picked from commit f78ec4aebf6e7c4b373c5889d785470b479ce39f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9b49e1490b8582655e3f11bb8c047f166b23e3ad
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 21:51:33 2012 -0500

    speex: comment out duplicate download rule
    (cherry picked from commit e63dd4e1e97b8131358306860707af568f72df10)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0b8a885c4609f2a8054b6fff03dd1ba70a30b37c
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 21:45:04 2012 -0500

    speex: enable full sinc table (added in neon patch)
    
    (text from the patch author)
    On many systems taking couple of kilo-bytes for full sinc table is not
    a problem. With a straight filter table the number of MAC operations
    needed drops to one quarter. Also the inner loop of the filter becomes
    more simple and easier to optimize. So the full sinc table version
    runs much faster in most cases. The trade off is some kilo-bytes
    bigger memory usage and more CPU needed when initializing the
    resampler.
    (cherry picked from commit b35a1328145b6f8c938d22f35df943669fe8146e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5b19bf6117e678a5e630bcc440c8ae66c41095f4
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 15:31:48 2012 -0500

    speex: add NEON support
    
    from http://lists.xiph.org/pipermail/speex-dev/2011-September/008242.html
    (cherry picked from commit 0ef89a6b388dca119fb4f1236e491ac887d0ee03)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a6d2bf40b07767d0acfa0375b60deb0c490b751b
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 15:25:32 2012 -0500

    speex: use git (last updated july 2009, 1 year more recent than 1.2rc1)
    (cherry picked from commit c1ca5dbcda400b3cd226783d24185d4e28092be6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a0d91d13e813a693f4334c9f88925a017ee27ca7
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 22 13:07:04 2012 -0500

    contrib: speex: enable ARM asm and fixed point if FPU is missing
    (cherry picked from commit 7a6940fb9c59864c5ef143d95c59ea31aa4e981b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 753231499beada8efa0ba3f46c8d758d52ef70c7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 22 10:05:48 2012 -0800

    macosx: fixed a crash in the video effects panel if no vout is present and set the slider values as their respective tooltip
    (cherry picked from commit 394b188ceced5e2a1df1a26e767d7f81a19c7bec)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 527bede6eeaa7fe2778a3270b5d29a8e93f614d5
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Jan 22 18:58:16 2012 +0100

    ball: do not enumerate choices in long text
    (cherry picked from commit 6a0e3463ff1e05fc15e0652166b3408a20007764)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e8f90743ea49b641a6413be99e2bd8dd215ee9b6
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Jan 22 18:57:35 2012 +0100

    ball: use sane default value for color
    (cherry picked from commit ff572f6e19eef3d0573d1b197dd671d59f91f9bb)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e08c1c2060ecb728e2e522f98805465156f1a881
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sun Jan 22 18:56:59 2012 +0100

    ball: fix filter variable names
    (cherry picked from commit 432a626a513e768023cfd5bf9fff735b146611fc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6e8970fb2efae064c175128da322f3832950ee02
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sun Jan 22 19:01:35 2012 +0200

    transcode: run user speficied videofilters before overlays
    
    For example crop/pad can change p_enc.in values, so run soverlay
    in part that they are actually correct in p_pict.
    (cherry picked from commit 82e22a4443bc431c4b0c759883db2960b492d97c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3a16f37ee6ca1fd7d7db17129e491ab6525ca41f
Author: Jean Baptiste-Kempf <jb@videolan.org>
Date:   Sun Jan 22 09:18:30 2012 -0800

    Fix MacOS gettext intl detection
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit e423b4ec42eaee7003f850d720a8e8c497e9edec)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 63b9d0a661c27d68912d972da347463149faee8d
Author: Faustino E. Osuna <enrique.osuna@gmail.com>
Date:   Sun Jan 22 15:58:14 2012 +0100

    macosx: don't assign NULL as pref button tooltip
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit bf8c4379b6d16102c78f8a9de49e50c6c683502c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f242a72f919d1616af094d1d45dee8472f4deba4
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sun Jan 22 01:36:04 2012 +0200

    Qt4: assume that items are appended to end, so start search from there
    (cherry picked from commit 7dfc1b4a65177736e358a2e671b760c81703595f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3eaee8b856043a5901c114f95f45d25b47bec0f9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 21 20:50:52 2012 -0800

    macosx: make sure that the fullscreen controller is always available when playing a video in lion's fullscreen mode
    (cherry picked from commit a91121012e8cc73be977bf53f7003c0310768cc3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cb6b36b1ee8334565b6b0f992bec10951fd5c820
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sat Jan 21 20:41:40 2012 -0800

    macosx: leave fullscreen when last playlist item stops
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit bd4d1b6907e545b8ecaf6971a8a20cb6bdfc7de4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 06d2cdf7b3b5b4d4253a77f7c08da4bb3084c379
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sun Jan 22 01:36:32 2012 +0200

    Qt4: only apply search to inserted items when search isn't empty
    
    This means we don't rebuild() everything with every item when we populate
    playlist without search
    (cherry picked from commit f043aa0e11894803f8b0f6f9f940a660d3a36069)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9be1c37a14f2a7454bd240a4a473c7ffdb27aa14
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 04:13:26 2012 -0500

    contrib: lua: don't use localeconv()
    
    not thread-safe, not available on android
    just use '.' as decimal separator
    (cherry picked from commit 6309ae8cb1f75aba2b6a5b3473dc635073c9ab3d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0c5fdbfe66cbad51ba2af881097312f1895efd0b
Author: Rafaël Carré <funman@videolan.org>
Date:   Sat Jan 21 09:47:00 2012 -0500

    OSX packaging: fix http lua
    
    Use make install instead of broken rule in a custom script
    Close #5891
    Also move headers installation from said script to package.mak
    
    We should use make install in the main directory but for some reason
    the rule recurses and never ends
    (cherry picked from commit 860a7e5c4193e4990f171cea93bddf43dba009b5)
    
    Conflicts:
    
    	extras/package/macosx/package.mak
    	projects/macosx/framework/Pre-Compile.sh

commit f49f5d38f1eb56e4e83f67afe7bcd9b0f017b8b9
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Fri Jan 20 12:58:26 2012 +0100

    macosx: select the right playlist item when a new file in playlist begins to play
    
    should fix #4812 for vlc 2
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 9ae001675da6a878b4bdbe3fc4c693bd9a802013)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1ee32a2679221ac78678a173b2bf68771d2ff973
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 20 11:57:03 2012 -0800

    macosx: make sure that the non-native fullscreen mode is correctly left when a clip is over
    (cherry picked from commit 9266718f657569e30e348564d37f90fdee297d36)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 14e5e4c5f643aaaaf4b4226063993030090f49f4
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 20 11:41:23 2012 -0800

    macosx: make sure that NSApplicationWillTerminateNotification reaches all of its observers
    (cherry picked from commit 3d7351e61608abf3aa724883aff20cff59b3b673)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 651932c592cba1b0ce86c059a5e4e0a9207c3d79
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 20 10:32:58 2012 -0800

    macosx: pause playback on window minimization only if there is an active video output (fixes #5882)
    (cherry picked from commit 1fb57312dde28b3e8d1bb966418229898d1fdfa5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 07aa16f5f85fc031c25d43407aa3ebb0f2e1c906
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 20 10:26:54 2012 -0800

    macosx: fixed unresponsive playlist correlated to video playback (fixes #5871)
    (cherry picked from commit 3ab779178263e7831e9e1d38b618428d0d44dad9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2022042fca95760af0be90a2eb10d58051e6bdeb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 20 10:25:12 2012 -0800

    macosx: fixed a crash when stressing the playlist by adding a larger number of new items
    (cherry picked from commit 75beeaed4f5a27201cc6310d1b8bef5505754a0d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 55b9bec48731ba754e7c4467d44871bcc3f14874
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 20 04:58:11 2012 -0800

    macosx: reset window level when closing the vout
    (cherry picked from commit 07c007cc2439e99b8d72fa8c94601f7c5fc92da2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 56c5878e14a23fbec7bf35825f9d5f48c8b60d59
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Jan 20 17:43:08 2012 +0400

    share/Makefile.am: musicbrainz art fetcher was renamed.
    (cherry picked from commit a7bd6bdebe4c9086e53cbc8e2d8928dff2e22298)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 021ed3f621e6686895d15fe94564e3bb295fdcd7
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Jan 20 17:32:28 2012 +0400

    Musicbrainz art: raise the priority to be the first one tried.
    (cherry picked from commit fdb56db9694f4e3df0b8a58cd6a63a486f662071)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 229f75eae24c9d2cf4977018fd9eac276ae76417
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Jan 20 17:23:26 2012 +0400

    Musicbrainz art: try to find image if album name is lacking.
    (cherry picked from commit cbfb9425df939d90ace2ae136b4c08485d71f981)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 491e9f92f846c0e729fa0b96267150c353776405
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Jan 20 15:13:30 2012 +0400

    Musicbrainz art: remove dead code. vlc.misc is unavailable in meta.
    (cherry picked from commit 0d9b87048de1d8567f84ec6d4eb6077561a6e1f3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4c7f14a6895c206ef82054d4aa2754173405e4f7
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Jan 20 15:09:27 2012 +0400

    Musicbrainz: look for content, not line number.
    (cherry picked from commit ce16db86ce9e72aa33f299401953d8ba023ca0a6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 44ae4d6c01e33f345207778c6a426028bf4f8e2d
Author: Konstantin Pavlov <thresh@videolan.org>
Date:   Fri Jan 20 14:24:47 2012 +0400

    Musicbrainz art fetcher: use version 2 API.
    (cherry picked from commit 7deea1888112c69aa61d30947f288eb3b3220426)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0c427a274c9ad8e0c72b50be158a5353d13d1ecb
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 20 10:46:46 2012 +0100

    Revert "contrib: live555: use armlinux config when building for arm"
    
    This reverts commit 4135148ba02495d59c01e190843bf2cc647c7ef1.
    
    It would seem that we need to discuss more about this, before.
    Back to the ml.
    (cherry picked from commit 21116876182133ab62ce0044a5ee5b176b6b477c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 59f9709b87acfb4f165926121ca7700109550180
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 19 18:00:59 2012 -0500

    contrib: qt4: apply qt 4.8.0 patch
    
    fix build with unmodified mingw32
    (cherry picked from commit a2f19dccae747eb6271401c01ace3d6acd929fd8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 89def090508c92428a276b05955f04e8ecab2f90
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 20 00:32:31 2012 +0100

    Revert "compat: install the static import library"
    
    This reverts commit 3c30f52ceee3de58d3a779d1f7e53415abbf4d22.
    
    Backporting a bit too  quickly it seems

commit 585f8f4934a10bb14ac9c36b9be8e256b7c41653
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 19 11:26:48 2012 +0100

    Use our own MB mirror
    (cherry picked from commit 306747df26951eda2adefd12609542a887452c73)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 97e0dc60de6a40ee29029ee29ffacfc1e63366ac
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 19 11:27:10 2012 +0100

    Use our DNS for freedb
    (cherry picked from commit 336c7415a6bc9b59bf31be798979e6cc5f99fdbf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 35cac5696cea74054b88dd4128189bc0ad5657f0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 19 23:32:19 2012 +0100

    Update live555 error message version
    (cherry picked from commit 768cafce8ddda08d12685319381b17f548e4c8e3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 697250c775f118e361a076ff598f9dbd36c9f987
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 19 23:03:56 2012 +0100

    AVcodec: disable slice_thread + HW decoding in MPEG-2
    
    Close #5867
    (cherry picked from commit e3bb4aa98e55beee6811f5aada8968f602fcd9bc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8151c90c68a27ab8e7bc3b4773acab16c7c2df21
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 19 17:01:27 2012 -0500

    contrib: patch live555 for android
    (cherry picked from commit 291dcb1f2b09840a23cf71762f1d7ef75669d22d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 106bcbd094a37754df1c688ee38dcccc2ebaf783
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 19 16:58:41 2012 -0500

    contrib: live555: use armlinux config when building for arm
    (cherry picked from commit 4135148ba02495d59c01e190843bf2cc647c7ef1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3c30f52ceee3de58d3a779d1f7e53415abbf4d22
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jan 19 20:05:48 2012 +0200

    compat: install the static import library
    
    With libcompat installed (into $(prefix)/lib/vlc/ or whatever), libtool
    will actually pull only needed functions from the static import library
    libcompat.a. Previously, it would copy every compat functions into
    every VLC binaries. This should shrink plugins a bit.
    (cherry picked from commit 78d45cc159a0cf1c44feef11a2b9800d9398048e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4eab79d38d0ec1acade691c408d6e289e863b9aa
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Thu Jan 19 19:15:07 2012 +0200

    Update live555 version check (close #5879)
    (cherry picked from commit 10f2d436c540f5aadecdf69c05adb00435aabce7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 01de6cbc2528ef3c6fe4bd9721a8fa45b34c7ed6
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Dec 16 00:22:14 2011 +0100

    Contribs: update live555 to latest snapshot
    
    The patches are not necessary anymore (merged) and the last issue,
    setlocale is not used anymore, for uselocale.
    
    Ref #5879
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4567b66189dbf45e87e82eadc541b7d70cc2d5c3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8ac537a3914e23416623d7ed0f96f95fadae9cbe
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Mon Jan 16 20:26:22 2012 +0100

    Reimplemented the blend filter in C++ and completed the colorspaces supported.
    
    It now supports all combinaisons of
    Destinations:
     - YV9, YV12, I410, I411 (8 bits)
     - I420, I422, I444 (8, 9 and 10 bits, native endianness only)
     - YUYV and the various variants
     - NV12/NV21
     - RV15, RV16, RV24, RV32
    Sources
     - YUVA
     - RGBA
     - YUVP
    
    The quality of the blending is the same, and the speeds for I420 is the same
    (not tested others combinaisons).
    
    Support for blending I420 over another picture has been removed (I don't
    see the use case and it simplify the code).
    
    It closes #5477.
    
    (cherry picked from commit fec8f97c7f712483d047e961b31b5cbec921692a)
    (cherry picked from commit 4729c93f0cfe187029f0aee1c85253bd54edc2ad)
    
    This commit is backported, because it is the only way to have proper
    Hi10p playback on linux using Xv with subtitles. I do not think we want
    to deal with the support of people asking why they don't see their subtitles,
    and switching to the openGL output with great drivers is...
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f459d157b3ccdeb83c04d9776e9b8729f76f61ec
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Thu Jan 19 03:45:19 2012 +0100

    youtube.lua: update to new website changes
    (cherry picked from commit 0137d3be215be27d29224bd04f921e41e9cac145)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 881baaa2acd3a0cd7f3d934b85f09e864445743a
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Wed Jan 18 16:35:40 2012 -0500

    macosx: Cache level pref should set file-caching
    
    The cache level dropdown in simple preferences previously did not change
    file-caching, only network-caching, disc-caching and live-caching.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c422cdda4db1e9f69f53e198de8c01ee691f5157)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d72394921280b585cd06177a8c567cde2e6a7b1a
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Wed Jan 18 16:35:39 2012 -0500

    macosx: Custom caching option should not set values
    
    Selecting 'Custom' for cache level in simple preferences should leave current
    settings alone.  Custom levels are set in advanced preferences.  Fixes #5868.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit fa4b920d664728768c3d15fe7ffc0f0a348cce9e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 62e338ce6f1aa7217df76ab716d26698adbf7d49
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 17 22:28:23 2012 -0500

    opensles::Play() : be sure to avoid infinite loop
    
    drop audio packet after 5 seconds
    it'll be much too late anyway; and 1 second later is arguably too late too
    (cherry picked from commit 6189c75855cf343875c334cd9a9b824b3585c5c0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b9fb627b8408c205b196fb0e4657519c009d4000
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 17 22:28:00 2012 -0500

    opensles: no space between * and type
    (cherry picked from commit d5b953c44a4bd5870e78d4272459a4a97393c344)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6879512a816c9b04577b7b3c45218b0dce4af990
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 17 22:27:39 2012 -0500

    opensles: use calloc
    (cherry picked from commit 4a9ecabe2c03c2918a30913aab1ab3d67ceabf5a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7cb66424aca5dcee97c61a8c7c29118f82c3a5b9
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 17 21:59:56 2012 -0500

    android: disable live555
    
    also remove obsolete flags
    (cherry picked from commit d8b9e7ae0784b0409bbbc039e9ebbcd95539f94c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ecb291201fce13af7fb8d4b1df6bb185b01bdb08
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 17 20:35:45 2012 -0500

    dynamic overlay: prefix some functions with do_
    
    The symbols clash with libthreadutil of upnp
    (cherry picked from commit e7211c9a48bed2fd345dfac5c33c7f59445ee613)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 933ef4c7467a396d8ca07edcfcf473045efcf844
Author: Olivier Gambier <olivier@webitup.fr>
Date:   Wed Jan 18 01:41:28 2012 +0100

    Fixing weak alias detection for llvm based compilers
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit dbedba79a4c61d3ea609a94afa07f4a7ddbf2d59)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit cab29ad8d3564a309776485891b10c0c97d19be0
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Wed Jan 18 19:05:15 2012 +0200

    fluidsynth: deal with glob() error cases correctly (and add debug)
    
    glob() sets the result structure also in case of error. The results
    may be incomplete.
    (cherry picked from commit 85488575ba5f5fe93738b73df5dc9e9d3351c8d3)

commit 4dbb8157ebb4e8507b3d54b51219929526d60e70
Author: Alexander Law <exclusion@gmail.com>
Date:   Tue Jan 17 22:38:54 2012 +0000

    l10n: Russian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 6a5d0b3afe34621781acaa5e680fe5abb6adbc99
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Tue Jan 17 22:37:20 2012 +0000

    l10n: Hebrew update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit c81ea0a95f4e5f9da46547988f9bc88ee7d41b1b
Author: Alexander Law <exclusion@gmail.com>
Date:   Tue Jan 17 22:29:19 2012 +0000

    nsis: Russian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit a24c61664bf57316fcdf6b97fbc5368af121acfe
Author: Rafaël Carré <funman@videolan.org>
Date:   Sun Jan 15 15:50:05 2012 -0500

    Implement libvlc_video_get_size(), close #3679
    (cherry picked from commit 8cf355785e002ade33af056c68123b395ff4e46f)
    (cherry picked from commit e64c71e8ea08ecbd678d4b652531a3ae151308f2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d5983f30cc80308597524da48b685bd0563c050b
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Mon Jan 16 20:25:00 2012 +0100

    Added NV12/21 support in rawvideo decoder.
    (cherry picked from commit 4f417ef5ed3c7dbe3094fded253c135132afa5c2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 746fb6ab1b8223e156bc5166d1d7d18f294e764e
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sun Jan 15 00:53:09 2012 +0100

    Fixed YV12 support in opengl video output.
    
    U/V planes were swapped twice.
    (cherry picked from commit 400a9e94170b6dcff6ec2e43ce8b5483ca2a8ede)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ead8a18c357650e9e7ba2077369d6891e955e997
Author: Gaurav Narula <gnarula94@gmail.com>
Date:   Mon Jan 16 03:44:32 2012 +0530

    LUA: add support for category field in SD nodes and items
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f8fa7854726df936f683f239c726f4719cb82ca7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 23e79b851dcfbbea7b4c6b6714def4cfc2ff91af
Author: Oleksandr Natalenko <pfactum@gmail.com>
Date:   Mon Jan 16 23:59:54 2012 +0000

    nsis: Ukrainian translation
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit affda26c07e495d12203670929cf5be4dadf229b
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Mon Jan 16 23:39:20 2012 +0000

    l10n: Hungarian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 05c507217650ad35f89511116786d85dc348525b
Author: Oleksandr Natalenko <pfactum@gmail.com>
Date:   Mon Jan 16 23:36:11 2012 +0000

    l10n: Ukrainian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 69d2d1b17a042db676d326bd531a53c27c016590
Author: Marián Hikaník <podnety@mojepreklady.net>
Date:   Mon Jan 16 23:35:02 2012 +0000

    l10n: Slovak update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 2706c6ad5340ee380e3c4b433e446e5a522f185d
Author: Mihkel Kirjutas <turakas@gmail.com>
Date:   Mon Jan 16 23:32:36 2012 +0000

    l10n: Estonian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 42d1b844db802627168e6b6de818ffc4df1e90c5
Author: Oleksandr Natalenko <pfactum@gmail.com>
Date:   Mon Jan 16 23:01:17 2012 +0000

    vlc.desktop: Ukrainian localization
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit db5e5a313ce7a3118b00e19eb958df20aed6fe3f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 16 03:56:47 2012 +0100

    Update POs

commit 618c7103717196dfd6a12372bdf4827ecfe1f97e
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Sun Jan 15 14:20:14 2012 -0500

    macosx: Add "Preload MKVs in local dir" to simple prefs
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 04c1aeb226a0b228bb2e61d843a190a594c685c8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e2bc53987aa7ed123c9077dcca9462e5031ab26c
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Sun Jan 15 15:40:01 2012 -0500

    macosx: Fix for compilation on i686 and PPC
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 056f72377faed75f22f89735f64961e8b1cbb30c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 140426faa114eb9db0a17843c14e2bfd22fddc5e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 15 21:54:10 2012 +0100

    Typo in NEWS
    (cherry picked from commit d9995bb6a5c9a2d1faa0083c7c0e3517e9567157)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6d162e5d5c04c73e1a26689a065ccfaf5be097dd
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Sun Jan 15 14:40:57 2012 -0500

    macosx: Compilation fix on i686
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 2845a74216f7289e5eb1ddcc5b3bdd998c5a57fd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d514f8f71bd40cbe1a81cd6d6862f5c5525e1dbe
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jan 15 20:20:38 2012 +0100

    macosx: avoid out of bound exception which can occur while reading from log array
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 2d81b923ef635a3336f127aa1530f4d3a1d5e18f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 54d688185088becc70c8d1e86152a09c8f6c3497
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 15 20:08:45 2012 +0100

    macosx: make sure that playbacks stops when closing the main window (fixes #5858)
    (cherry picked from commit ad4ff46f2b04d96eb4b4dfab5a39d6d1dc25025c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e2382985204d646a01dbb59136124f54c424d040
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 15 19:37:12 2012 +0100

    On the road to 2.0.0-rc1

commit 47a585998cc3540d57e964276ecf31a9d5a8b869
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 15 17:13:16 2012 +0100

    macosx: fixed fullscreen mode when linking against older SDKs (fixes #5857)
    (cherry picked from commit b0ac1fc6a24b2835d4af359a7d3847c80b0a3e9b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fa7a70499c9f3d01940e4a1778d9fb5a849f2f32
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Sat Jan 14 23:13:55 2012 +0200

    Qt4: don't sort listview of model allready has items
    
    For example when starting with files, keep commanline order.
    Fixes #5207
    (cherry picked from commit 7a28f1931d3e19b7a7094fb8ec48a8bf98847875)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5cf9fd70177328c273ff86b608d2b6f99f066cac
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 15 16:16:20 2012 +0100

    macosx: fixed correct display of UTF8 strings within the Extension dialogs (fixes #5848)
    (cherry picked from commit 6afece092f9fcba610c43f3331a99f646caaebfa)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1cab81b1e43fa597d72e8f97b9c5cca22295f88a
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sun Jan 15 00:27:52 2012 +0100

    VoD: fix deadlock between RTSP and VLM
    
    The deadlock would occur when the VLM would stop an instance and detach
    its RTP output, at the same time as an RTSP client would issue a VoD
    command to the VLM.
    
    Unfortunately this introduces a race condition where wrong RTP-Info can
    be returned.
    (cherry picked from commit 7ac6ae55e2496c7178ce0b15a3c16a2db464a38c)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit ff2b15c79865f5608821668113c10971f69bfab9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 14 19:55:37 2012 +0100

    macosx: fixed compilation after ugly merge
    (cherry picked from commit 7e47a1f723ed381b86f66cd93465e7fdbd95723c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 08356016bf80544c4a9c80a04d1d9c0fe3579add
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Fri Jan 13 21:04:50 2012 -0500

    macosx: Update file headers on extensions
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit de5f5cfac4f59cda181e631f5d4a7421098861af)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6ebc5512b79059d6820431443fbddaddec6b1ca0
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Thu Jan 12 16:36:02 2012 -0500

    macosx: Add extensions menu entry
    
    Adds an entry to the 'VLC' menu for extensions, which is then auto-populated.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit ced48b310db5f137084e0fcc1783c1ac006a96f3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4ec0cb4123a172a0ac5daca7eab281486fd143fd
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Fri Jan 13 23:04:25 2012 +0100

    macosx: Lua extensions infrastructure
    
    Add files for extension creation management, add them to the build process, and
    add them to the XCode project.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit efa2f96d313baacbc013bb554a444c00d5ba82a6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 50cd0bcc6db3686110f1b1a45347cc787d433a0c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 14 19:03:00 2012 +0100

    macosx: fixed enabling/disabling SDs through the sidebar
    
    note that the playlist table remains to be fixed to show the current selection only
    (cherry picked from commit 4c0f16871304032f95f0d56737d438c17621d51d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 862de86b83ca4c26c8408a3c1b5461f1059ba659
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Jan 14 10:04:50 2012 +0200

    Update libvlc SOVERSION w.r.t. later VLC 1.1.x releases
    
    (cherry picked from commit 4c71616474b67a8440cee59ee6d157863b443b66)

commit 47ea5741d9ff0f81458bf1691fa3138f91f0d821
Author: Rémi Denis-Courmont <remi@remlab.net>
Date:   Sat Jan 14 09:42:30 2012 +0200

    Sanitize LIBVLC_DEPRECATED
    
    Pointed-Out-By: Olivier Aubert <olivier.aubert@liris.cnrs.fr>
    (cherry picked from commit 05a4a2710c09ac5f3a81324cf15d69f89d2083a6)

commit 761772b98070260c7091ec5afc788e6a62f47cc8
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Jan 14 07:04:25 2012 +0100

    Qt: fix indentation
    (cherry picked from commit 59984e4f18524d8c6d3e82c292bfdde9d9c27092)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2bfd6a8d9d1ba896a609234be907db8fc6d043a1
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Jan 14 07:03:38 2012 +0100

    Qt: rebuild correctly the playback menu
    
    And also, close #5522
    (cherry picked from commit 921a659cf599ac0afd943aeed0a4fc085cc4f24f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 15d8afb033a534b0980992aa765c1efcf1264321
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 13 23:24:35 2012 +0100

    Qt: remove unneeded include and parent objects
    (cherry picked from commit 06ca7e5db55f291040b577b7fcdcf95d6bc514a4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 185209fa4ac0e78316468f6a32a10b143b47b068
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Fri Jan 13 15:45:43 2012 +0100

    Icecast SD: add Radio in the title
    (cherry picked from commit d16dfb3998616e32cb729dcceadd9b429c2886f7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 756cfca1ffbbe14fbc158491a62472c2eb309389
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Jan 13 03:57:50 2012 +0100

    Qt: seekpoints: don't use qtu() shorcut in this header
    (cherry picked from commit 755c0cb307f82ce1602d255c0d882448fca02187)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 128abc7ed22710746a95fa5fb1d205dddd9049f0
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Thu Jan 12 15:54:39 2012 -0500

    Lua SD: add methods to item object to change metadata
    
    Close #3474
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 95f73b03b7933b767f82b3cb57851b7ff0214ff2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1cba7788e50804e696abaeec0e26f257395da752
Author: Denis Charmet <typx@dinauz.org>
Date:   Thu Jan 12 21:22:43 2012 +0100

    Fix the subtitles loss at MKV segment changes
    
    This patch add the new es before deleting the old ones which causes
    the default sub track to be used according to user preferences.
    
    Fix #5625.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit fa0dc29afabea001cf21db04766b003e5cf7845e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4dcd250362c55f634d64635e7ca824ef66ea98b6
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Jan 12 17:41:36 2012 +0100

    auhal: always set audio device callback
    
    Previously, the audio device callback was only set when you call probe.
    But in the case you reload the module (for example when switching from
    encoded to unencoded output over the UI menu) probe was not called again.
    This resulted in a crash when we want to delete the callback while closing.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 0f62e1ad4efcaf72f2d99784c8a19a9b0dbea968)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit de75cf1dd28ad5800fb5a135ed6aaeb4e7fffed0
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Thu Jan 12 17:01:26 2012 +0100

    macosx: proper menu validation for all menus
    
    Especially this fixes validation for audio and playback menus.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit a6fcfb7702be958a60d60496d3cdfe0d4bf37d5d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1ff9b08fadee44dd59918a4b64adc3547caebe4d
Author: Francois Cartegnie <fcvlcdev@free.fr>
Date:   Fri Jan 13 03:30:11 2012 +0100

    Qt: seekpoints: assume chapter name is utf8
    (cherry picked from commit 1b23d5cc728e1411406ef0680e230203333b4e93)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e750da527545890d5021c9f0d582984c89f26156
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 12 22:14:55 2012 +0100

    Fixed out of bound writes in grain filter for non mod 8 video.
    (cherry picked from commit 8473f0753678b6ddf507a0cd9f6043704464b0e7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d0ebc8264f2e0c1a0daea8240e42dd75d4348431
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 12 15:51:07 2012 -0500

    VLCKit: fix bootstrap
    
    the script was not only invalid but it wouldn't call bootstrap either
    (cherry picked from commit fc4007ed496df3948f68d15167aa75d188791c6d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 964c85aa2acd4bd8a83bd238de17454e674ffdfa
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 12 21:31:13 2012 +0100

    Fixed a potential integer overflow in MemToBlock().
    
    When the integer overflow happens, the block_t returned will be smaller
    than requested.
    It fixes the second half of #5841.
    (cherry picked from commit 04c9c0e7e8f4687c9881c6ad10d9e31152249697)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 81a54d65d27ed6a5c1c944857982110932b0985e
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 12 21:23:25 2012 +0100

    Fixed a potential integer overflow in block_Alloc().
    
    When the integer overflow happens, the block_t returned will be smaller
    than requested.
    It partially fixes #5841.
    (cherry picked from commit 64756cf2a5f704774c16f0842edc00044a062be0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d30f72c5a14535c29f51b13425a1a766acec3e7a
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 12 10:56:58 2012 -0500

    VLCKit: use darwin9 for i386 contribs
    (cherry picked from commit 3789e68e1bc9321fd11e72ea64c8ac491d46e359)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58269f3fadbf31408df49bfc05a28a6e96b23b14
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jan 12 13:32:04 2012 +0100

    VLCKit: fixed compilation for x86_64
    (cherry picked from commit 4f97eb9457506211b88c41b4e822def4d9e03493)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 36550b775fe88cd32f12a22ef744b1835033cca9
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Jan 9 23:26:08 2012 -0500

    Revert "Fixed a crash caused by yadif on Windows XP (again #5793)"
    
    This reverts commit 577b183d295adbea85e03502d73d04fd3f90ef90.
    
    This breaks compilation on FreeBSD8 and OSX (both x86)
    (cherry picked from commit c397950e5b5f078d3134198885bdd1238133e4b7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 10b45f92ddcbd506a24bef21151df29c681b4e6e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 12 15:57:53 2012 +0100

    On the road to RC1

commit 28aac87e687c8574f9fe0bba46d47a67767cb136
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 12 01:50:59 2012 +0100

    Small fix for italian update

commit 620aaaf78dc11fb9f310ad112ab9ffed4a7a4976
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jan 11 15:09:17 2012 +0100

    macosx: re-written the messages panel to use a table view instead of a text view. this vastly improves its performance and prevents any related crashes known to me so far
    
    thanks to poldi for the idea
    (cherry picked from commit b0aa6c5fa295ea7437abfb06566ad0db5b143bd0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 653c9bcac58ebaedbfba7bf617db183bae32980c
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jan 11 21:40:38 2012 +0100

    macosx: prevent ugly rendering artifacts when resizing the black main window on a slow CPU by adding a black backdrop on top of the clear window background
    (cherry picked from commit 498f15b30a450919f0e2a76ba102e431c8f01859)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2d05710f1a68d012d3be90e7bc0c1318d5f56e94
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jan 11 21:16:15 2012 +0100

    macosx: only enable Lion's fullscreen mode in case VLC was linked against the 10.7 SDK
    
    plus some other fixes
    (cherry picked from commit 0e608f941642aa0620fb07431eee25c92f329751)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ab9a1c5fac49ac8230e503a6767abdcdf3f6ed24
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jan 11 19:53:27 2012 +0100

    macosx: reimplement 'fullscreen video device' (fixes #5831)
    (cherry picked from commit b9e1088003e3e5c1fb6202affd63b3b6b3d914ed)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e7c027a1d2d0584d3d46eb4330f224601b609df8
Author: Sidney Doria <ssdoria@gmail.com>
Date:   Wed Jan 11 23:14:40 2012 +0000

    l10n: Brazillian Portuguese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 9b206ffd8aa4959d8b41332da0674f53f23b0bab
Author: Xabier Aramendi (Azpidatziak) <azpidatziak@gmail.com>
Date:   Wed Jan 11 23:13:42 2012 +0000

    l10n: Basque update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 181d96e846fcf45412b6482937546e73f346a066
Author: Vincenzo Reale <smart2128@baslug.org>
Date:   Wed Jan 11 23:12:47 2012 +0000

    l10n: Italian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit afdd7aeba3b340d45905ab54fd0f0212032590c3
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Wed Jan 11 23:11:02 2012 +0000

    l10n: Japanese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 85fa8390db073ff1c7715d45e1da62fb12082059
Author: Dean Lee <xslidian@gmail.com>
Date:   Wed Jan 11 23:10:12 2012 +0000

    l10n: Simplified Chinese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit f70ad6ad2d5479080f5cd55a68ec91c4cfb5091d
Author: Mario Siegmann <Mario_Siegmann@web.de>
Date:   Wed Jan 11 23:07:53 2012 +0000

    l10n: German update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 884b7e4ad8c75a4ddf8b2a6519255cd2c15c00b7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jan 11 18:42:09 2012 +0100

    Qt4: restore search in SD
    
    Close #5545
    (cherry picked from commit d1902eb8d655d269f342d0562d0e63c1b0ab136d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7dc8626c029dc91f713711a759e5c4c02ba24ae3
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jan 11 16:02:35 2012 +0100

    Bump plugin version to small ABI changes in decoder_t

commit 93cedb9e6e08c8de57f37c547040b1c4e4fcf4ee
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Tue Jan 10 15:11:04 2012 +0900

    Use force_align_arg_pointer for yadif crash on Windows XP
    
    This patch affects only on MinGW win32 builds.
    Fixes #5793.
    
    Signed-off-by: Rafaël Carré <funman@videolan.org>
    (cherry picked from commit cef4b56a6f7b467300858bf125aaa7098481cb5d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 04fc5ff697764e7ce3109a1def38bccfe38c1023
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 23:26:33 2012 +0100

    Improved default threads count when using automatic mode in avcodec.
    (cherry picked from commit 87e9c403dece6d0c347d7314402f1919cb36b859)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7029ccb80b67594ae598f3a7451bf0384a979645
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 23:10:48 2012 +0100

    Clip number of thread to 16 when using threaded decoding in avcodec.
    
    It workarounds an avcodec issue.
    (cherry picked from commit e587ce36787d2519a774d27465d71b2272c9c6c4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ab36432e2d5d1093169554df58441efd96aea214
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 22:55:29 2012 +0100

    Set decoder_t::i_extra_picture_buffers in avcodec decoder.
    
    It should fix #5753.
    There can still be an issue with an insufficient input caching.
    (cherry picked from commit 5539fea75b47b3c8c68c2f5e8a268904f4c019ff)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fe74f9288ca33c5a967f3454c89beca2840fbe3d
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 22:45:46 2012 +0100

    Added decoder_t::i_extra_picture_buffers field.
    
    It will allow to specify the number of needed extra picture buffers due
    to decoder latency.
    (cherry picked from commit 74e141c59fa8013c6088be652ec67701502e1db6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b6d998df7ae0f74b884e6989a0de06b49c2a92ec
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 20:58:15 2012 +0100

    Avoid potential integer overflow when computing AR when transcoding.
    
    It was introduced by [99e262c40f7de62aa4969b1584cce3390f80cc23].
    (cherry picked from commit 0c0c1a06aedab0ddd73c7a9bf5290527deb07da0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7c976039f6a963f1ef975ec8883acb8527b7d371
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 20:50:42 2012 +0100

    Fixed the format used for subtitles blending when transcoding.
    
    With [99e262c40f7de62aa4969b1584cce3390f80cc23], it closes #5755 and #5756.
    (cherry picked from commit d650147f1ce9b4bb7fd141c1841eb342d1048a5f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 99e262c40f7de62aa4969b1584cce3390f80cc23
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 10 20:48:40 2012 +0100

    Fixed video AR given to the encoder when transcoding.
    (cherry picked from commit 45ee0e5c08f3ace0cb314f9108839ce856ba3f4e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 58d6e3bcca151d024c321fed8d2c42f3b40f15b3
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sun Jan 8 22:09:55 2012 +0100

    Ignore files without their beginning in RAR archive.
    (cherry picked from commit 1ac5b35ca17c3316a5cc1ef4ddda3dcd98f27de8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5e5e66adfa86d27aa89d2ec8489b118bacc0298c
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sun Jan 8 22:09:10 2012 +0100

    Do not error out on empty rar file.
    
    It avoids trying to play the file.
    (cherry picked from commit 136942f307a3fee34c6a9f11353328f264e9027b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit adb6aa03545a62092aca3e1e8e62cc78255a76d0
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sun Jan 8 22:07:08 2012 +0100

    Improved detection of splitted RAR archives.
    
    Some rar archives doesn't have an end block.
    (cherry picked from commit 09d1c6e1891cdc914d25279aabdd83c13baab227)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7704eec34c77eae06afe70614c6aa6995a959193
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Mon Jan 9 23:17:03 2012 +0000

    2012 Release Key
    (cherry picked from commit 2150d3eaccf77b59bd03202bf3496c21fab24abc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 08d06b22f765649c8e9fd99b05ec955017cf4e54
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Mon Jan 9 17:09:15 2012 -0500

    Only allow clearing playlist if current item can be edited
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4f771d1d5cab79ff16a494edb2c97bb7366f923d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7a0d24520b4c41ea0ec487a4911d0d3d69413d70
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 9 22:08:24 2012 +0100

    Qt: avoid a crash on displaying the chapters for some mp4
    (cherry picked from commit 491b918f5628a502a6bcf89141e5ecfba3c7757d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f6fb26cfcfd0eed9640252e4158217c4ee92ad29
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat Jan 7 01:25:36 2012 +0100

    Fixed a possible NULL dereference in the GME demuxer.
    
    It was added by [5e0e7978ffa0ad34c780c08caf518efcc4082127].
    (cherry picked from commit ffc31b5c43de67733ee90b3ea07409a7d81733d0)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fee7a101043dfc4446f7eb44b0c6166d77c2459d
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat Jan 7 01:15:42 2012 +0100

    Load files to memory when needed for loading GME files.
    
    It happens when the size information is missing.
    It closes #5766.
    (cherry picked from commit 5e0e7978ffa0ad34c780c08caf518efcc4082127)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 025280c1fde9f85aa0e7ef34e36c039c823db5a4
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat Jan 7 01:14:03 2012 +0100

    Added stream_BlockRemaining() helper.
    
    It is usefull to load a whole file to memory.
    (cherry picked from commit 63af7c781fe9c3cf07babb8befacd1d87b2182ca)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 359200ba5a0f5b531ab66fb357901e6b6645da82
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Mon Jan 9 13:35:16 2012 +0100

    macosx: fixed crash when log window is open while progress window is closing
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 69a6354729fe83768f0e117889bb415969c25f75)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8b1e0416fd5ee3528c25f944ba2c67bcdc353391
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 9 14:42:16 2012 +0100

    Win32: Merge direct3d-desktop and video-wallpaper to fix usability issue
    (cherry picked from commit 520e60b66c2747105a91222cf101bfc806cd55f9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6e04904ccc854d017427090453dbd6e85da08084
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 9 14:36:02 2012 +0100

    Qt4: remove wallpaper from simple prefs and allow it on the video menu
    (cherry picked from commit efd3ce8fa8000a626ad0b7fcaf4cb1f288c2c487)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 48206c55b17c58adc35ed61d1c6bbeb2653572b0
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 9 11:53:22 2012 +0100

    Contribs: build gettext with llvm
    
    Close #5801
    (cherry picked from commit 2b3f7fc5c6cc3cc9334761d41d8e266b10b7f87f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 447578df027188fbbf202a9826210c4160c3398d
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Mon Jan 9 02:25:51 2012 +0100

    youtube.lua: partial fix for format matching
    
    Stereoscopic formats would get mistakenly selected
    (cherry picked from commit 0d4e2968970e2a344ce81c979b78e27435c485c6)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 61a7b0013fb9da124825d983b1884786ed269442
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 9 00:52:08 2012 +0100

    1.2.0-pre4

commit eff2b91b947322b7eccdf6c6914de29ce32881b4
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jan 8 21:05:25 2012 +0100

    macosx: fix auto play when adding a new file with file dialogs
    
    The issue was that we had 2 VLCPlaylist objects although they should be only one. Therefore this commit removes the wrong one in Open.xib
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit aba135724b94f77e5e2d561cd249792f4d217340)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 11b3731eda74fb539230390ecfba85e4711f901c
Author: David Fuhrmann <david.fuhrmann@googlemail.com>
Date:   Sun Jan 8 21:05:24 2012 +0100

    macosx: respect b_enqueue value when adding items to the playlist
    
    also adds forgotten PL_LOCK and removes a commented out code block which should not be needed anymore
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 3ed6c0090febe190909fb867ae4dfac5311e9c06)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b8329984530011448504316d0e13a691671d01dd
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 8 18:03:36 2012 +0100

    macosx: fix DVD menu control and usage of hotkeys with modifiers
    
    fixes both #5733 and #5806
    (cherry picked from commit a3349c78515633fec940c37ef469252a730fb529)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0747e1ccdda053398e8ceb12588b7bfc9dbe767e
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Sun Jan 8 22:19:43 2012 +0000

    l10n: Refresh all .po for -rc1

commit f08c0a4777b3702314f109ee3d07a0998b244872
Author: Christophe Mutricy <xtophe@chewa.net>
Date:   Sun Jan 8 22:18:04 2012 +0000

    l10n: Update vlc.pot for -rc1
    
    5 new strings

commit 9b612d125e93a4af24c62deeed4739d5603072cd
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sat Jan 7 13:41:19 2012 +0100

    cue.lua: fix file path concatenation
    
    Use the same approach as in the playlist module
    
    This should fix #5398
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b33269e785fbe4541c2b52700181c005066528d9)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit a570c3f448895849d2ada425892d5aa9064432b1
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Sun Jan 8 13:59:33 2012 +0900

    Fixed a crash caused by yadif on Windows XP (again #5793)
    
    Align stack variables manually in yadif x86 code.
    This is fixed for the issue that yadif crashes VLC on Windows XP.
    This issue happens win32 build on Windows 32bit.
    This issue doesn't happen win32 build on Windows 64bit.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 577b183d295adbea85e03502d73d04fd3f90ef90)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ed5f49bbf11ea7f258bf6a8962205627e6a9e391
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 8 14:18:35 2012 +0100

    macosx: always expand all sidebar nodes on launch (fixes #5811) and make sure that the sidebar isn't editable by the user
    (cherry picked from commit 72f3e860b6f12775f9d965121f34a994f3dcbf74)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 8af341cda8d76c8af2816cc164b7d3dea146ea5e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sun Jan 8 14:05:52 2012 +0100

    macosx: fixed pl counter and make sure we pause the input on minimaturize (closes #5809)
    (cherry picked from commit af6ffdaac40af9e5622e7521693f0186865e0e97)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 480ba36824785137e1dcee8253ecd6c5073f206e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 21:53:38 2012 +0100

    macosx: fix the window menu's close and minimize commands when using the black window style
    (cherry picked from commit 09ad74bd3606a9dc876f1d3647bd74e016d47a7a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 93727d66c86e7aa649afccf114362328b1efaacc
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sun Jan 8 01:15:17 2012 +0100

    Contribs: update crystalHD to the latest headers
    
    And removed our patch that has been applied upstream.
    Close #5795
    
    Pointed by Mangled Deutz
    (cherry picked from commit 0bce87068194ed1a06e6e81daa9dfca9c578a953)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f209b25493954e216efa4681b394a45beddf1780
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 18:52:48 2012 +0100

    macosx: fixed compilation issue on Leopard
    (cherry picked from commit 4665c50e94985e35eec8d3f2171812440a17d806)
    (cherry picked from commit c4808dbd84321a9447c4bc2d3c761586a3317e47)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 7e21fe9aa63b7280c9c45fc1a6bda16333109a70
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 18:24:08 2012 +0100

    macosx: improve handling the mute action in the main window. disable slider and fullvolume button in case mute is active. (fixes #5800)
    (cherry picked from commit df8a9d08077afb7de671c3d6de4bde323de5c61c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 71d3328ff5bf19c04cee42aede79622078856832
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 18:02:19 2012 +0100

    macosx: make sure that the bottombar controls don't respond in Lion's native fullscreen mode (fixes #5799)
    (cherry picked from commit bf2aac7578db445855c33537ff4207138214dffd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f6c874c99d01e43a12946c6815740d13db0ced23
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 17:44:29 2012 +0100

    macosx: fixed trivial appearance issue with the time slider's gray gradient
    (cherry picked from commit c0a55dc721f8e15198c37be0efe32be4934ee783)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1c89be66cc2a665637d6c4bcc48d705704324aa9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 17:12:37 2012 +0100

    macosx: some improvements to the non-embedded vout window
    (cherry picked from commit a7026d196a8c6e154079873b2592d684ae1131ef)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 36b438b5b190372f878ba81d6455228940f12551
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Sat Jan 7 14:45:57 2012 +0100

    macosx: re-add the 'Reset' button to the image adjust filter, since it used be present in the past
    (cherry picked from commit 4b7092988ef85ce131f3803aec11f1b677e59c7b)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ab827594a178fe3e4d3df76d31b7434fd6e76fc3
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sat Jan 7 19:36:09 2012 +0100

    lua: fix sign errors in us_tonumber()
    (cherry picked from commit 541ccdc6134a6340afcf9e0f9612f2a86e733ed6)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 5c1cb49e05d03a3dc52ebac9d2e0b84f5a03a1a7
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Sat Jan 7 17:58:09 2012 +0100

    lua: add and use us_tonumber() for decimal numbers
    
    Closes #5705
    (cherry picked from commit c90a3e02568368f55f454aee7c89ed57a945ed17)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit 92bea26db97bac31392da4dd76e308da62a64db1
Author: Naohiro KORIYAMA <nkoriyama@gmail.com>
Date:   Sat Jan 7 20:15:24 2012 +0900

    Fixed a crash caused by yadif deinterlacer on Windows XP
    
    I did incorrect modification moving [16] out of DECLARE_ALIGNED(),
    and it caused a crash.
    
    Fixes #5793.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit a4ad11925259f716d65a8527c188339f67affad7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e4af18e126c2e041dda000421b0f3d03346b0d1b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Jan 7 01:53:06 2012 +0100

    Qt: use "normvol" instead of "volnorm" in Simple Preferences
    
    Close #5792
    (cherry picked from commit 28958fd5930d1efe9801213354b4998e4a881fc4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 056b713c9f6135b3df5e7edc176ab66ea45ede09
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat Jan 7 01:43:03 2012 +0100

    Fixed jamendo playlist demuxer.
    
    The check is a bit less strict to adapt to the various URL we can get.
    It closes #5661.
    (cherry picked from commit 13295779a6dbc6924c28343e4ff47e5ef6345a40)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4c49c016203bfd2c09de726eaef50f8bfdb64045
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat Jan 7 00:58:40 2012 +0100

    Factorized the Filter() function of motiondetect.
    (cherry picked from commit ea6be1180916f7eacd31cb7f341a66e7c5633674)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0428f1424acbf1a9495bf4095b2be93f9a1942f9
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Sat Jan 7 00:35:15 2012 +0100

    Fixed motiondetect packed YUV filter function.
    
    A filter shall not return an input buffer.
    It closes #5748.
    (cherry picked from commit 76821fb12d7e3a5cf6be62f023852c8091b09a69)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 06867781e1b663db314a2305ed1e01dcbcfda1d2
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Fri Jan 6 23:02:45 2012 +0100

    Fixed a typo "Elasped" -> "Elapsed".
    (cherry picked from commit cdae44ac1286152bcfffa61eb358447bb6864632)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 49ee431b88845b540e5fcfac88d365d601669b07
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Fri Jan 6 22:43:18 2012 +0100

    Fixed ICY metadata support when HTTP chunked transfer is used.
    
    It closes #5628.
    (cherry picked from commit 94d21282e56fb9ccd8e2e98e058b24909d63839c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e271860328d0c27f566fdf9d3b81acc02a5b6957
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Fri Jan 6 22:20:56 2012 +0100

    Execute EOF when an error occurs while reading the chunk header (HTTP).
    (cherry picked from commit c16b17c630c48c28a2f31629ff736e41cc789d73)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5e4b9d41e62f8612fd57df31e86c10d34e5a8127
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Fri Jan 6 21:00:10 2012 +0100

    Fixed potential overread in the rawvideo decoder.
    
    The plane size of the pictures given to a decoder can be a bit larger than
    necessary. It can happens when the video size is incompatible with the
    colorspace.
    
    It closes #5770.
    (cherry picked from commit 4a26ac7f892063dcc79ade092e490a6e4168f8f9)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 02ccf893db61d7083a2e0bb2b96149c0af97f97e
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 22:20:54 2012 +0100

    macosx: fixed volume range (fix #5790)
    (cherry picked from commit 2a1e9a20029d0c06693f200666934e70224cedb6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 3338391df0767cf471f9e298f37fa7714148158a
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 20:42:05 2012 +0100

    macosx: fixed interface crash on quit
    
     fixes #5779
    (cherry picked from commit 0c4c7f06de78d4ace0f33103dc66b9f81cd964fc)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit eac12c57d6cd72ef05c7d7473bf1ab2cb5bbc6ee
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 20:14:58 2012 +0100

    macosx: fixed rare crash when reshaping the video view (fixes #5740)
    (cherry picked from commit 52eae1b9ed74a3dbcd0ff39345c4da3316fa587c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1124bc639e71835d7dd173314bb8b48bace35857
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 20:03:12 2012 +0100

    macosx: fixed border styles of playlist table and sidebar when using the gray main window style (finally fixes #5742)
    (cherry picked from commit 7d62684674a61043f649034eec5244ca92328c61)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2b0c1ed0112625b079a72c40ab36aaaef3a65bcb
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 19:49:41 2012 +0100

    macosx: don't draw the time slider's 'fancy gradient effect' on Leopard, since this leads to ugly artifacts due to the outdated CoreAnimation version
    (cherry picked from commit cd4bf104f3db9527581865f44312dbdd696eab39)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit b959bf6c6e541697ec558eadd13ea36dbba644fa
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 19:39:36 2012 +0100

    macosx: make sure we update the menu from the main thread only (fixes #5737)
    (cherry picked from commit 8e3953e5508260bba516c09836fe44a180d0ef22)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 89601853cdc1d08350bf38a9b9034febaf09489b
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 19:32:40 2012 +0100

    macosx: really fix the messages panel (fixes #5541) and added a 'live update' checkbox to turn off frequent updates since this is quite load intensive
    (cherry picked from commit 4012f039158e644656ce80819663765169472092)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d860092a88e83cc71f71e86f3cd65eb498d73d22
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 15:55:08 2012 +0100

    macosx: speed-up loading the open panel by loading its xib once VLC is finished with launching instead of prior to showing the panel
    (cherry picked from commit fbaafcaf8acc376a95e35a9ed9736034ec32ef3f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5d534c98f2edc4889f05801f89c81941cbebaee7
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Fri Jan 6 15:50:09 2012 +0100

    macosx: open panel: fixed cmd-R if no QTKit compatible device is connected, hide the screen input module on Lion, optimizations
    
    (cherry picked from commit ab060cf4e97060827ac5396b2784e1706c81fdf5)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5b1efdf86ce6c18353683745a7b1e442012e30c6
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 20:38:55 2012 -0500

    android configure script: allow custom options
    (cherry picked from commit 42e415b4895b65412e00f7516a0e615ad5d23f60)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f98ee11c24fd5cf42096ca2f820e5b56798df7d1
Author: Thomas De Rocker <thomasderocker@hotmail.com>
Date:   Thu Jan 5 23:52:07 2012 +0000

    l10n: Dutch update
    
    With the good file this time. Not like in d8f9df648b.
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 6a08ca36507636843706aa299d6b80b5c9a0ee49
Author: Dean Lee <xslidian@gmail.com>
Date:   Thu Jan 5 23:39:48 2012 +0000

    l10n: Simp. Chinese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 3d5af5e31f5ea47a4234877fe3a6b8fb04943159
Author: Praveen Illa <mail2ipn@gmail.com>
Date:   Thu Jan 5 23:34:15 2012 +0000

    l10n: Telugu update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 74de7a204d20a565e585a65b4047b7f88a0dfbbe
Author: Предраг Љубеновић <predragljubenovic@gmail.com>
Date:   Thu Jan 5 23:30:41 2012 +0000

    l10n: Serbian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit a8d95fc6de1815af7906d67c2284015ae195da03
Author: Alexander Law <exclusion@gmail.com>
Date:   Thu Jan 5 23:27:20 2012 +0000

    l10n: Russian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit d8f9df648beae6938868b6ad7723794b3305b448
Author: Thomas De Rocker <thomasderocker@hotmail.com>
Date:   Thu Jan 5 23:24:09 2012 +0000

    l10n: Dutch update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 46c837799157d026c2d1aa67c9d25ae7c6fad64d
Author: Fumio Nakayama <fumio.n6a@gmail.com>
Date:   Thu Jan 5 23:21:10 2012 +0000

    l10n: Japanese update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 528f91982bce80c5d6da55e3d1fda84069db5e37
Author: Vincenzo Reale <smart2128@baslug.org>
Date:   Thu Jan 5 23:19:57 2012 +0000

    l10n: Italian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 25053def116b6ece130657ca0c4d73686cf511e0
Author: Luqman Hakim <ovdl@rocketmail.com>
Date:   Thu Jan 5 23:18:27 2012 +0000

    l10n: Indonesian update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 7e5dabc343a4ed986ad27f20e7ddc15be2e062a4
Author: Xabier Aramendi <azpidatziak@gmail.com>
Date:   Thu Jan 5 23:16:34 2012 +0000

    l10n: Basque update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 032350a9a5e362c5152feed1811c8df1bd4cfd40
Author: Dean Lee <xslidian@gmail.com>
Date:   Thu Jan 5 22:54:06 2012 +0000

    nsis: Chinese l10n update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 11114cf52d237a125684320c243e731117bf571d
Author: Dean Lee <xslidian@gmail.com>
Date:   Thu Jan 5 22:50:36 2012 +0000

    vlc.desktop: Chinese l10n update
    
    Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

commit 1cf70d1df4a3f785f8b3a737b92b186a06a54d00
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 5 22:55:42 2012 +0100

    Fixed rendering of subpictures with non 0 offset in direct3d.
    
    It is needed for DVD menu support.
    (cherry picked from commit 1772a146c2a2b9a76af44e1226765aa8368f3b0e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2b7431287fc2feb637a5a5176065237707f0ee9d
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 5 22:54:34 2012 +0100

    Fixed rendering of subpictures with non 0 offset in opengl.
    
    It is needed for DVD menu support.
    (cherry picked from commit 446263eab3452e84c2c0f7b8725c97585b6f5720)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit a7958769099b1b5d3224ef4a2d0d32c23974d036
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 5 21:52:59 2012 +0100

    Fixed zvbi subpictures AR.
    (cherry picked from commit 4343ec78a1fd2af33549d26c0e6bdd2702148ba8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 835a5c0059f869ee6f92b2bfd1d07555d8c78909
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Thu Jan 5 21:50:46 2012 +0100

    Scale subpictures without AR to fill up the whole display.
    
    It closes #5683
    (cherry picked from commit 705d11a4de11c5ab20941f36f93589b855a5c3ce)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c7d8dd75c13094411a8aae03f03dcca724295479
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 5 19:29:32 2012 +0100

    Qt: code simplification
    (cherry picked from commit 02631b2e668f3badc8c6a3349f946d146f4afcdd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d3812045d010c828fe3dc910dfa6f1a456bcde9b
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 5 19:09:03 2012 +0100

    Qt: increase the bottom margin of the controller by one.
    (cherry picked from commit 7066f3499092bf7b635db70d4f418375f8ac0104)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0473347903a41627b9a8ae8b8123d90877bfe532
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Thu Jan 5 14:25:58 2012 +0100

    Invert speex_dsp and src score capabilities
    
    This is probably temporary, since SRC is more computationly intensive than speex_dsp
    But this close #5781
    (cherry picked from commit 5c261b04db7a7b7af65d169b7ee0700b55e72cef)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e87d7ea6b81cbf8df13da35aebbda89e3ba0de72
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 05:18:02 2012 -0500

    contrib: upnp has config.* in a custom dir
    (cherry picked from commit 9b100a5a7ea90ce626cc68430b083040a2749c5e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 34b7985aa27d22aec67339d2d1735b2d348e28fb
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 04:57:32 2012 -0500

    contrib: samplerate has config.* in a custom dir
    (cherry picked from commit ccf99a62de0e94ea8f6497a9688b7e5cc22d0be3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 20cf5c9ec256222cfac8bc06ea0edb4fa516711c
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 04:29:46 2012 -0500

    contrib: dvbpsi has config.* in a custom dir
    (cherry picked from commit d62d0e3f8f2cb96c755bf8e0666bf4dc248b827d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 31cc76ab0bedb11c978ac3ca905bf6fbd254880a
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 04:25:04 2012 -0500

    contrib: update config.{sub,guess} in some packages
    (cherry picked from commit f0296b66c7ce3385042227f79f462862995c177d)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 88fa831f074e870623ca7060f01704ab6f0dbd71
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 04:22:35 2012 -0500

    Revert "contrib: run $(RECONF) in an arbitrary list of packages"
    
    This reverts commit c9a3688176a1571ab5cd9b77b6fddc3e1a110b62.
    
    Conflicts:
    
    	contrib/src/dvbpsi/rules.mak
    (cherry picked from commit aa2748bdc5f45139ec803c9597d80f1f0321f6fd)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 68aa15d612044fd63e2f1cd26cfb72c7f2500bd9
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 04:02:15 2012 -0500

    extra/tools: bump automake version
    
    This version's config.{guess,sub} knows about android
    (cherry picked from commit e69c9040387facb214967a14b5adfa0393157ed4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 42ff85eff89cec1297c64a286d3ca42efedd84d0
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Jan 5 03:41:38 2012 -0500

    contrib: openjpeg: update config.{guess,sub}
    (cherry picked from commit 2e554edca115a506bdb7ec07323aebf3e628fd0f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 78227855f6696e1829182efe889c9c006a49dcdc
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Thu Jan 5 12:50:38 2012 +0200

    x264.c: move mbtree closer to other bitrate options
    (cherry picked from commit 140a7dbc9bcb4cb717fd955e98d4c27abc077ffe)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0d97f931626af999b602771f55ac8e34c3aa621f
Author: Ilkka Ollakka <ileoo@videolan.org>
Date:   Thu Jan 5 12:44:19 2012 +0200

    x264.c: partly revert vbv-bufsize option handling when bitrate is defined
    
    Previous code didn't actually behave so well with small keyints etc.
    (cherry picked from commit f1e222cf3197da2a0c395b5a8eae745e470d312e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 197e6a6355681dac6a26f23b8b4e96d25a71a7a6
Author: Sharad Dixit <sharad.eminence@gmail.com>
Date:   Thu Jan 5 02:41:15 2012 +0100

    Qt4: Fixed uninitialized variable
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c023657699e30dbdb6681d5364e73c3114f7e27e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 652e97aa8b82350207b448231b3f21041dfb5c35
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 4 20:08:17 2012 -0500

    contrib: libmpeg2 has autotool files in a custom dir
    (cherry picked from commit ebb59d3627b60e4f7547d0e36805c99e9d8e94c8)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2df61dd9c0e674c54b505449bb77d4126f839bed
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 4 20:03:59 2012 -0500

    contrib: orc: fix android build
    
    google's gcc doesn't understand 'restrict'. Use __restrict__
    (cherry picked from commit 702502969a8af0c166e6a6ee0af5063d8e742e28)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 2cb5558519125f4a7243581db6dc9f7eee69a2f4
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Dec 28 10:24:21 2011 -0500

    contrib: fix schroedinger build with android toolchain
    
    google's gcc doesn't understand 'restrict'. Use __restrict__
    (cherry picked from commit 9f3cdb0791751d638311fe442bae5b8cc0e46408)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9829cd12fdc3c9cce14b2175ffc3d1f81f243799
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Dec 26 21:13:32 2011 -0500

    contrib: gnutls: fix android build
    
    gl/ builds replacements for standard headers in case the system ones don't work
    but it has the reverse effect: provided headers work and built ones don't
    (cherry picked from commit 937f97f2dac655071db62faf2e148b905ec41b94)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f331039859e030266e71c603571141856eb266c9
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 4 19:58:19 2012 -0500

    contrib: update config.{guess,sub} on some old packages
    (cherry picked from commit 6e034ff2a289e497a28e6ca4eba1b4e396aac775)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 52d45ab6b8b284af68b9cbdc04c9a08e96108586
Author: Rafaël Carré <funman@videolan.org>
Date:   Mon Dec 26 21:10:39 2011 -0500

    contrib: gme: fix android build
    
    gcc doesn't understand __restrict, use __restrict__
    might break MSVC++ compatibility
    (cherry picked from commit 37b428889762b86e3ab9afed4367e9a8882b87e2)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit da2bc8fdcad7d1471d0410ce412d22467982e932
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Jan 4 19:48:23 2012 -0500

    UPDATE_AUTOCONFIG: use $(UNPACK_DIR)
    
    We can't use $@ as we operate before the directory is renamed
    (cherry picked from commit 7046b6122b7af1ca7bfa462f33a507959528cb9a)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 1cf012bce53143cb30adb4060387c86ad620c2f9
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Thu Jan 5 01:36:38 2012 +0100

    macosx: fixed build script
    (cherry picked from commit a0a79c3ec407c604880a4f24a05b4eecd6e62029)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 717d737151914b75fb9d2aacd8baa6057838eed9
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 3 22:19:42 2012 +0100

    Fixed potential NULL dereference when openning splitted rar files.
    (cherry picked from commit 632b98d497c8c36b6bf1f61a8400501e293f51a4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c58d6d69ecf918ddba22054a5bfa04d6ec33c1bc
Author: Laurent Aimar <fenrir@videolan.org>
Date:   Tue Jan 3 21:01:49 2012 +0100

    Fixed BDA support (close #5627).
    (cherry picked from commit 435f1d55e7745df14c4e3a725d18dc2f32b6c7f1)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 29aa431ea715fbe989f985fa98b4a7c999a994e9
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Dec 28 11:03:50 2011 -0500

    contrib: gmp: update config.{guess,sub}, needed for android
    (cherry picked from commit 73b765d645757f1ef70c71a7589ff9875a5b9999)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e86f51352508f3d438dbc8b4da76aa9492d7bdae
Author: Rafaël Carré <funman@videolan.org>
Date:   Wed Dec 28 11:03:25 2011 -0500

    contrib: helper to copy recent config.{guess,sub} from automake
    (cherry picked from commit e10f808bfda43a49dff3b49cdac6edc18c3b67db)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 75c93cb2bad39a72a3c6251cdac3b6206f8c78ca
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jan 4 19:37:59 2012 +0100

    Xspf: fix crash
    
    See http://forum.videolan.org/viewtopic.php?f=12&t=96883
    (cherry picked from commit 4c21c6506d93a9cf92992bf302a53ad77ddf7829)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 725db369e900df10c96ede2411b96593316f0419
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Wed Jan 4 18:25:47 2012 +0100

    extras/tools: added openssl needed for native compilation on Darwin 9 / OS X 10.5
    (cherry picked from commit 0921213abbe77ebe799fe8fac17f9a234bcd0fcf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 68eeac8e40cece0b88aa2a372085aea11a074e62
Author: Brendon Justin <brendonjustin@gmail.com>
Date:   Tue Jan 3 15:33:25 2012 -0500

    macosx: hide the mouse cursor in Lion fullscreen
    
    Though #5327 is closed, 1.2 and 1.3 nightlies do not work
    as expected.  The patch makes the cursor hide after every
    mouse movement.
    
    Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
    (cherry picked from commit 07dcbf50fc83a85ee92643285d7164cfe04aafdf)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 9aa8352466814dde256f9d1ffda15844907f30a4
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Wed Jan 4 01:28:49 2012 +0100

    DShow: remove choices from translated string
    
    Should simplify translators' work
    (cherry picked from commit fd08420aeb1a37a9b5ceaf47ae3dd442ed438138)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 84cd6e041eef923ed259d9836edef8f760dbb24e
Author: Rafaël Carré <funman@videolan.org>
Date:   Tue Jan 3 17:42:30 2012 -0500

    update macosx/build.sh
    (cherry picked from commit aa7354d14a4c54f50a736098aa674f4f951e74c6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 308a27498ed0eff55f41c3c7506a53cb55446375
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Jan 1 14:04:59 2012 -0500

    Qt4: Add new timelabels to default layout
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit e0fee1e53f3891b6a90f8720d991fe1b6e876cc3)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit fa557863740b58bbe514282fb49916e864503ed1
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Jan 1 14:04:58 2012 -0500

    Qt4: allow more types of timeLabel in toolbars
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit abfcd0d5d391256477a45e0b3d07b90ce924e561)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 527681a3c5f9a8b940891a24aa986a7af3982b08
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jan 3 18:34:13 2012 +0100

    Qt4: add the slower/faster buttons near the speed slider
    (cherry picked from commit e06dc3899f89f45b712e8e6e0693169c72fd12e7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit f4e6eb8fddfd52355005ae8d93d81e580052f6e9
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Sun Jan 1 14:04:57 2012 -0500

    Qt4: allow speedlabel in toolbars
    
    Modified-by: Jean-Baptiste Kempf <jb@videolan.org>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 18120e5ae23e61a7172dec0321d386e0d877702e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c0a36f95e7f1c1c26a20eb74d97d2d24c5946842
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Wed Dec 28 01:25:48 2011 +0100

    Qt4: Add aspect ratio combobox to toolbar editor
    
    Close #4127
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c630050511ad95a7a7336b3529211c1162130126)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 79a346b095c810894dbb17722103787d70014d42
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Tue Jan 3 09:31:50 2012 +0100

    Denote warnings in demuxer that can happen in normal situations
    (cherry picked from commit f6287174c439ce69f3abc4d3705e5fd303045421)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 955adb074f15c46a1a21447dab9bbbc1ee915444
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Mon Jan 2 23:57:36 2012 -0500

    Qt4: Fix a small playlist docking bug
    
    Fix a small playlist docking bug where the playlistWidget is not properly set as a Qt::Widget, causing it to behave inappropriately.
    
    Close #5773
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 6a0131dae6a119a72fbec2bce995ca1dfcd9b5be)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 15e62b22fcb87de71bbe24ed9e3380a2bd9ce1e5
Author: Pierre Ynard <linkfanel@yahoo.fr>
Date:   Tue Jan 3 02:37:48 2012 +0100

    NEWS: IPv6 fix-up
    (cherry picked from commit 1874005cf2614660bbe929de6b43d547996c1ff5)
    
    Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

commit dfacbce0b468e9dafdfe3828dff0d4db06e3f8cd
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Mon Jan 2 16:42:02 2012 +0100

    Qt4: Actually save when a convert profile is deleted
    
    Close #5769
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit b02e4929f8a5e7cbdf01915f1e9d76eeb0e2ece6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit e00a15d33218260723d211aa720fd83c326132ce
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Mon Jan 2 15:58:49 2012 +0100

    Qt4: Fix docked playlist videoWidget bug
    
    Fixes issue where docked playlist doesn't "release" its embedded videoWidget
    Close #5588
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 42aab54543c177fb26d74f7fab630151b4ab83f7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit c9e37cd80e514a66378f391d4bf20b99b2b5acea
Author: Faustino E. Osuna <enrique.osuna@gmail.com>
Date:   Mon Jan 2 14:30:48 2012 +0100

    Fix typo in M4 Cxx flags macro
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit c1df08645f506aff78b0aaab1609380d78b2551c)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 07fffc759628889b5eee1be4614db53823081111
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Mon Jan 2 14:02:56 2012 +0100

    Qt: Move the clear playlist button to the context menu
    
    Modified-by: Jean-Baptiste Kempf <jb@videolan.org>
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 4b21b04e9fde44100c61c259ce8282a504aaa748)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 0ad8e3307884f0bb08947662986b6cbd93c9c1f1
Author: Felix Paul Kühne <fkuehne@videolan.org>
Date:   Mon Jan 2 13:32:08 2012 +0100

    macosx: remove some more intermediates creating when packaging and creating the dmg
    (cherry picked from commit 1a821f0b718f3c4e62f1a34ff2861fc3ba9ea592)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 4c53910c62d4885d8fb99810de19cb02421b2ddd
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 2 12:24:05 2012 +0100

    Qt4: code cosmetics
    (cherry picked from commit df4031fba65951de611744254beb29f89ee9f304)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit ec9c958ac55a3c388f88f04abb51c4e4f4192cc1
Author: Edward Wang <edward.c.wang@compdigitec.com>
Date:   Mon Jan 2 12:16:50 2012 +0100

    Qt: ensure currentItem() to be not NULL in PLSelector
    
    Close #5764
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 9bf74a1e7e105ed8f7abc9a12f87eb8b473055b6)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 5a7868fa2e69bca0446f16e119624010e60d50c3
Author: Cheng Sun <chengsun9@gmail.com>
Date:   Sun Jan 1 23:26:31 2012 +0000

    ball: zero-initialize video_format_t to prevent crash with packed chroma.
    
    The ball filter requires that fmt_comp.video.p_palette is NULL, otherwise
    image_HandlerDelete tries to free it.
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit 29a5f1324f8979f199125958d7f2821750b5f78f)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 775cc9aa9af711768ef1bb79751faf898aac28f7
Author: Cheng Sun <chengsun9@gmail.com>
Date:   Sun Jan 1 23:25:23 2012 +0000

    Psyche/sharpen: Add chroma checks to prevent crashes
    
    or malfunctionning filters
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit f15ce26448d6bebd8a9c8cc84257bedd18fb5536)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 34bb811d24eadff7ea5ecc4bb36dccfe64186126
Author: Cheng Sun <chengsun9@gmail.com>
Date:   Sun Jan 1 23:36:31 2012 +0000

    Minor fixes to spelling in documentation
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
    (cherry picked from commit ef88dfda4c502006455e53ad339ed0d0b9b57cc4)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 82312b8e9a56a3dd8a557c71815a858505d12cad
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Mon Jan 2 01:00:51 2012 +0100

    Happy New Year
    
    (cherry picked from commit c7fd79264f42ff8a6c7ac65fddb77f476d7ca1e7)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit d123c6e5931b1fe1a91e6d0fd7dbf89a801935ae
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Dec 31 03:04:42 2011 +0100

    File audio output: remove useless longhelp
    
    We have the format selection for that
    (cherry picked from commit 945943a21cf2962f2162e673920b0b503ef20f6e)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

commit 6d2cf9f35b16f9910e287ab953178aaf5f7274d6
Author: Rafaël Carré <funman@videolan.org>
Date:   Thu Dec 29 18:09:58 2011 -0500

    contrib: Only use options common to Libav and FFmpeg
    (cherry picked from commit 0accbd7955c0b4448137482362801cbed6ada750)
    
    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
