Commit Graph

663 Commits

Author SHA1 Message Date
28c751023a Merge branch 'master' into ffmpeg 2014-05-14 15:56:33 -07:00
361bc34f93 metadata: add libavcodec > 54 compatibility
libavcodec55 brings some API changes, including CodecID => AVCodecID.
Add a compatibility wrapper so we can build with libavcodec >= 55.
2014-05-14 15:44:15 -07:00
ad4c7fbebe Merge branch 'master' into ffmpeg 2014-04-30 10:19:09 -07:00
8e05f9b6f7 Allow the user to specify an arbitrary root container. 2014-04-29 16:12:42 -07:00
820b5857a5 Fix a few memory leaks in some error conditions during image manipulation. 2014-04-29 10:44:34 -07:00
9b1d541dc8 Merge branch 'master' into ffmpeg 2014-04-28 16:02:19 -07:00
61bb91ecc9 scanner: check defined media types before parsing files 2014-04-28 16:01:30 -07:00
7cc550ac14 Merge branch 'master' into ffmpeg 2014-04-28 12:32:50 -07:00
f9c37fb205 clients: add BubbleUPnP detection and enable subtitle support 2014-04-28 12:04:19 -07:00
13e3613dd6 Minor code simplification. 2014-04-28 12:00:59 -07:00
4eeb0858e4 Merge commit '750917f7ea9876d7a97f48aa4b22097fcf7958d9' 2014-04-28 10:47:01 -07:00
67e673fe51 Merge commit 'e4fcb71' into ffmpeg 2014-04-25 17:31:48 -07:00
e4fcb717e7 log: replace a few fprintf's with DPRINTF's. 2014-04-25 17:31:12 -07:00
750917f7ea minissdp: fix minor uninitialized access 2014-04-25 17:13:07 -07:00
be5f4a50eb Type data pointer variables as uint8_t. 2014-04-25 14:30:38 -07:00
381c4805e6 subtitles: accept smi in addition to srt 2014-04-21 15:44:39 -07:00
0721528bcd sql: introduce sql_get_int64_field()
Returns int64_t instead of int.
2014-04-21 15:43:13 -07:00
27a29f9e92 tivo: clean up some error checking 2014-04-18 16:18:00 -07:00
08c21f39d1 http: fix error handling in the fallback read/write path 2014-04-18 15:46:00 -07:00
e2cebb68e1 albumart: use a separate variable for temporary pointer storage
Re-using the same one confuses some static code analyzers, and
is a bit less readable.
2014-04-18 15:36:38 -07:00
331d484555 utils: add noalloc flag to modifyString()
This should make it more straightforward for code analyzers to
tell if the function is going to allocate memory.
2014-04-18 15:18:44 -07:00
b0550495e8 sql: use va_end() where appropriate 2014-04-11 14:34:23 -07:00
5676a17204 cleanup: remove unnecessary sbeacon set 2014-04-11 12:51:16 -07:00
ffb8b35424 cleanup: avoid dereferencing NULL pointers 2014-04-11 12:43:59 -07:00
5bbd7b5443 albumart: remove logically dead code 2014-04-11 12:36:20 -07:00
c6367aa4ce minissdp: fix potential out-of-bounds read 2014-04-11 12:31:32 -07:00
3a57744735 Add printf attribute to log_err/DPRINTF and fix a few warnings
Modified to not use %z for portability reasons.
2014-04-10 18:57:30 -07:00
45cf9208fb Declare printf-like attributes for strcatf() and xasprintf()
Declare printf-like attributes for strcatf() and xasprintf(), and
clean up errors found by the compile after doing so.
2014-04-10 18:18:28 -07:00
57c6510fe4 upnphttp: improve robustness against malformed (possibly malicious) requests 2014-04-10 18:10:55 -07:00
01532b0490 upnphttp: check realloc return while receiving request body 2014-04-10 17:49:01 -07:00
4a507cc84c upnphttp: limit receive headers size to 1 MB 2014-04-10 17:48:49 -07:00
92b6061929 upnphttp: check realloc return while receiving headers 2014-04-10 17:48:33 -07:00
92ab16c96a Fix typo in multi content type example 2014-04-10 17:48:10 -07:00
bc43d45964 Clean up a couple return value checks. 2014-04-07 14:20:50 -07:00
27eae53584 process: remove logically dead code. 2014-04-07 11:26:37 -07:00
d492b43ef8 Fix various potential illegal access and memory leaks in error conditions. 2014-04-07 11:20:19 -07:00
6e43ab3c06 Introduce THISORNUL macro. 2014-04-07 10:29:56 -07:00
e3792ad8da upnpsoap: fix uninitialized read with emtpy filter 2014-04-07 09:08:30 -07:00
301b045cd1 Fix Broken SSDP Multicast Membership Addition. 2014-03-31 09:15:37 -07:00
435bd3d04d Use SERVER_NAME variable when checking for existing process. 2014-03-17 11:41:10 -07:00
9c8bc5d9c2 status: note when a media scan is in progress 2014-03-17 11:32:56 -07:00
98ebb0f5d5 albumart: code simplification 2014-03-17 11:01:36 -07:00
76a1ffff4e cleanup: remote obsolete references to listening_ip 2014-03-14 19:06:07 -07:00
0ea24845eb clients: add Asus O!Play support and quirks
Asus O!Play reboots with titles longer than 23 characters with some
file types when there are subtitles present.  So we truncate video
file titles with external subtitles.

It also supports subtitles in LG fashion, so add that too.
2014-03-13 10:48:41 -07:00
365d5c3412 upnpsoap: make subtitle support more generic
It sounds like more clients may support subtitles using a res element,
so we should make our support more generic.
2014-03-12 11:59:10 -07:00
cce9a012b3 config: add merge_media_dirs option
By default, if there are multiple media directories specified, there
will be entries for each one in the root directory container.  If
there is only one media directory specified, then just its contents
will be in the root container, to save one level of browsing.

Setting this option changes the default behavior so that multiple
media dirs will behave like a single media dir.
2014-03-12 11:40:49 -07:00
7c0739ad3f config: introduce strtobool() helper. 2014-03-12 11:32:09 -07:00
e3a53fc8a3 clients: separate Samsung BDP and TV client types again
Advertising the DCM10 vendor-specific feature to Samsung Series
C and D (at least) players causes them to always browse ContainerID
1, no matter which section is chosen from their GUI.

Treat TVs and BDPs as separate client types with unique features.
2014-03-11 14:46:21 -07:00
d10293b038 autoconf: Use subdir-objects, to silence warnings from new autotools 2014-03-10 10:00:52 -07:00
10471aa29b portability: fix compiling on systems without iconv 2014-03-07 13:20:26 -08:00