aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/os_support.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-24 13:31:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-24 13:42:58 +0200
commitf3b8096bc0e7df9e45db1023d6e6e7bff177d0c4 (patch)
tree9b3c775ca329b0453593297d2bd7915ac88bb61e /libavformat/os_support.h
parent42ee9f3981979880209a60d1ac30057fcfab6e53 (diff)
parent0c03cc68386443f1e96ab6fb358220faf67cd5ff (diff)
downloadffmpeg-f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4.tar.gz
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff': mp3: exit on parsing error in mp_decode_frame rtmppkt: Avoid unescaped backslash in Doxygen comment fate-lavfi: replace sed/grep/cut combos with awk build: Plan 9 support Conflicts: configure tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/os_support.h')
-rw-r--r--libavformat/os_support.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 589eb7ee5e..b06cefd45e 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -67,7 +67,7 @@ static inline int is_dos_path(const char *path)
return 0;
}
-#if defined(__OS2__)
+#if defined(__OS2__) || defined(__Plan9__)
#define SHUT_RD 0
#define SHUT_WR 1
#define SHUT_RDWR 2