Permalink
Browse files

Merge remote branch 'origin/master' into AE

* origin/master:
  [WIN32] updated ffmpeg dlls
  [WIN32] fixed build
  added: identify DTS-HD profiles in audio stream list
  added: [Confluence] audio codec flagging images for DTS-HD MA/HRA
  added: dtshd_ma and dtshd_hra identifiers for DTS-HD
  added: show profile information in codec info when available
  added: export DTS profile information in ffmpeg
  Add seekpercentage argument to the PlayerControl built in function. See ticket 11096.
  Zero sockaddr struct when initializing. Thanks yuvalt
  updated: ticket #11093 - icelandic translation. thanks to kristjan
  cosmetics
  fixed: apparently cwiid doesn't pull the bluetooth library properly on        all distros (ubuntu 11.04 in this case). thus link to it explicitly.
  • Loading branch information...
2 parents c5d348b + 9985528 commit cb5cb11f1fea7615e6446a49a7eeea474f115953 theuni committed Jan 22, 2011
Showing with 1,465 additions and 155 deletions.
  1. +10 −7 addons/skin.confluence/language/Icelandic/strings.xml
  2. BIN addons/skin.confluence/media/flagging/audio/dtshd_hra.png
  3. BIN addons/skin.confluence/media/flagging/audio/dtshd_ma.png
  4. +45 −115 language/Icelandic/strings.xml
  5. BIN system/players/dvdplayer/avcodec-52.dll
  6. BIN system/players/dvdplayer/avformat-52.dll
  7. BIN system/players/dvdplayer/avutil-50.dll
  8. BIN system/players/dvdplayer/postproc-51.dll
  9. BIN system/players/dvdplayer/swscale-0.6.1.dll
  10. +1 −1 tools/EventClients/Makefile
  11. +6 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacenc.c
  12. +24 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
  13. +358 −3 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dca.c
  14. +13 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264.c
  15. +9 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libfaac.c
  16. +5 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/options.c
  17. +21 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/utils.c
  18. +17 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/common.h
  19. +47 −0 ...s/dvdplayer/Codecs/ffmpeg/patches/0039-Add-av_popcount-to-libavutil-common.h-and-bump-minor.patch
  20. +498 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0040-added-export-DTS-profile-information-in-ffmpeg.patch
  21. +84 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0041-Add-av_get_profile_name-to-get-profile-names.patch
  22. +55 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0042-Show-profile-in-avcodec_string.patch
  23. +51 −0 .../cores/dvdplayer/Codecs/ffmpeg/patches/0043-h264-add-profile-names-for-the-existing-defines.patch
  24. +36 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0044-aacenc-add-recognized-profiles-array.patch
  25. +39 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0045-libfaac-add-recognized-profiles-array.patch
  26. +40 −0 xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0046-dca-add-profile-names.patch
  27. +37 −0 ...s/dvdplayer/Codecs/ffmpeg/patches/0047-dca-consider-a-stream-with-XXCh-X96-in-ExSS-as-DTS-H.patch
  28. +11 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp
  29. +3 −0 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
  30. +15 −0 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
  31. +2 −2 xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
  32. +7 −7 xbmc/lib/libjsonrpc/FileItemHandler.cpp
  33. +2 −2 xbmc/lib/libjsonrpc/JSONRPC.cpp
  34. +2 −13 xbmc/lib/libjsonrpc/PicturePlayerOperations.cpp
  35. +2 −1 xbmc/lib/libjsonrpc/TCPServer.cpp
  36. +19 −0 xbmc/utils/Builtins.cpp
  37. +6 −3 xbmc/utils/StreamDetails.cpp
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Translator: Kristján Bjarni Guðmundsson-->
<!--Email: kristjanbjarni@gmail.com-->
-<!--Date of translation: 2010-11-18-->
+<!--Date of translation: 2011-01-19-->
<!--$Revision$-->
-<!--Based on english strings version 35254-->
+<!--Based on english strings version 35672-->
<strings>
<!-- Misc labels -->
<string id="31000">Breyta -</string>
@@ -60,7 +60,7 @@
<string id="31102">Bakgrunnur</string>
<string id="31103">Sýna "Í bið" í myndasýningu</string>
<string id="31104">Spila kvikmyndasýnishorn í glugga [COLOR=grey3](Aðeins myndbandaupplýsingarglugga)[/COLOR]</string>
- <string id="31105"></string>
+ <string id="31105">Sýna myndatitla í bakgrunnsleit</string>
<string id="31106">Ýmsir valkostir</string>
<string id="31107">Fela flagg lesið frá skráarnöfnum [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
<string id="31108">Fela hnapp í aðalvalmynd</string>
@@ -87,13 +87,16 @@
<string id="31128">Lagatextar</string>
<string id="31129"/> <!-- blanked 2010-11-12 -->
<string id="31130"/> <!-- blanked 2010-11-12 -->
-
- <string id="31131"></string>
+
+ <string id="31131"/> <!-- blanked 2010-12-23 -->
<string id="31132">Viðbót fyrir lagatexta</string>
<string id="31133">Viðbót fyrir þýðingartexta</string>
+ <string id="31134">Undirvalmynd myndbandaheimasíðu</string>
+ <string id="31135">Undirvalmynd tónlistarheimasíðu</string>
+ <string id="31136">Undirvalmynd ljósmyndaheimasíðu</string>
- <string id="31140">Tónlistarskjár</string>
- <string id="31141">Myndbandaskjár</string>
+ <string id="31140">Tónlist</string>
+ <string id="31141">Myndefni</string>
<!-- Script labels -->
<string id="31200">Flýtileiðir</string>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit cb5cb11

Please sign in to comment.