aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/os_support.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-24 03:38:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-24 03:41:22 +0200
commit7b376b398a464a5825ede8b10d5f605c526c7399 (patch)
treee254c50f44e8befc83e4dde353ff3cd6189f2061 /libavformat/os_support.h
parentc225615bf2da206775c5ff2b56d648cf50d38756 (diff)
parentb1ac139d89b9fc55b70ad3411af2f75fe8b17805 (diff)
downloadffmpeg-7b376b398a464a5825ede8b10d5f605c526c7399.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/os_support.h')
-rw-r--r--libavformat/os_support.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index df321511ed..f770528365 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -45,6 +45,11 @@ static inline int is_dos_path(const char *path)
return 0;
}
+#if defined(_WIN32) && !defined(__MINGW32CE__)
+int ff_win32_open(const char *filename, int oflag, int pmode);
+#define open ff_win32_open
+#endif
+
#if CONFIG_NETWORK
#if !HAVE_SOCKLEN_T
typedef int socklen_t;