OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b5a7100) | patch
os_support: make poll() fallbacks conditional on CONFIG_NETWORK
authorMans Rullgard <mans@mansr.com>
Fri, 28 Jan 2011 17:16:15 +0000 (17:16 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jan 2011 02:41:00 +0000 (03:41 +0100)
commit13904b552b48e72bc472f98144ab54d0535ce99e
tree5185aecfa2a1644e1eedcc776bd54b427a5c7a8btree | snapshot
parentb5a7100ad33df8c4ae9aa847633efb24d3c4b1c9commit | diff
os_support: make poll() fallbacks conditional on CONFIG_NETWORK

poll() is only used by networking code, so the fallback should
only be built if networking is enabled.  Also remove CONFIG_FFSERVER
condition from the declarations.

This should fix building on systems without poll(), broken
by a8475bbdb64e638bd8161df9647876fd23f8a29a.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362d8f7d9e6a3bca2ce89f767d153d3ab8bf5773)
libavformat/os_support.c diff | blob | history
libavformat/os_support.h diff | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help