diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-23 21:00:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-23 21:00:52 +0200 |
| commit | 66f6f9f0768de5b003fc1b0fa9b1ea428466308a (patch) | |
| tree | 157b98be78b0cd1e99b3dd51979bc97792d11642 /stream | |
| parent | ebb541c6553af10203b2c2f5bcead6118a44f5be (diff) | |
| parent | 30aa2383cadb2f879e02dca9df293c01119a3111 (diff) | |
| download | mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.bz2 mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.xz | |
Merge svn changes up to r28712
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/dvbin.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/stream/dvbin.h b/stream/dvbin.h index 84c9d2c625..dcb22ce238 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.h @@ -38,9 +38,16 @@ #undef DVB_ATSC #if defined(DVB_API_VERSION_MINOR) -#if DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1 + +/* kernel headers >=2.6.28 have version 5. + * + * FIXME: are there any real differences between 3.1 and 5? + */ + +#if (DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || DVB_API_VERSION == 5 #define DVB_ATSC 1 #endif + #endif |