diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 17:46:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 18:04:34 +0200 |
| commit | 1c66807636ed8da5cf81d75cc8bb2726c6d6bc21 (patch) | |
| tree | dbb5d2fafe49a56ce5d608c74ae32929c08a4405 /tools | |
| parent | 85c830331c36502144e1cc9cf8aa7bd177e1d79d (diff) | |
| parent | d488c3bcbaf7ddda42597e014deb661a7e9e2112 (diff) | |
| download | ffmpeg-1c66807636ed8da5cf81d75cc8bb2726c6d6bc21.tar.gz | |
Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
* commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112':
configure: support Bitrig OS
yuv2rgb: handle line widths that are not a multiple of 4.
graph2dot: Use the fallback getopt implementation if needed
tools: Include io.h for open/read/write/close if unistd.h doesn't exist
testprogs: Remove unused includes
qt-faststart: Use other seek/tell functions on MSVC than on mingw
ismindex: Include direct.h for _mkdir on windows
sdp: Use static const char arrays instead of pointers to strings
x86: avcodec: Drop silly "_mmx" suffixes from filenames
x86: avcodec: Drop silly "_sse" suffixes from filenames
sdp: Include profile-level-id for H264
utvideoenc: use ff_huff_gen_len_table
huffman: add ff_huff_gen_len_table
cllc: simplify/fix swapped data buffer allocation.
rtpdec_h264: Don't set the pixel format
h264: Check that the codec isn't null before accessing it
audio_frame_queue: Define af_queue_log_state before using it
Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/h264.c
libavcodec/huffman.h
libavcodec/huffyuv.c
libavcodec/utvideoenc.c
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cws2fws.c | 6 | ||||
| -rw-r--r-- | tools/graph2dot.c | 7 | ||||
| -rw-r--r-- | tools/ismindex.c | 4 | ||||
| -rw-r--r-- | tools/pktdumper.c | 6 | ||||
| -rw-r--r-- | tools/qt-faststart.c | 3 |
5 files changed, 24 insertions, 2 deletions
diff --git a/tools/cws2fws.c b/tools/cws2fws.c index 68f7953b56..74588c10a6 100644 --- a/tools/cws2fws.c +++ b/tools/cws2fws.c @@ -6,11 +6,17 @@ * This utility converts compressed Macromedia Flash files to uncompressed ones. */ +#include "config.h" #include <sys/stat.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#if HAVE_UNISTD_H #include <unistd.h> +#endif +#if HAVE_IO_H +#include <io.h> +#endif #include <zlib.h> #ifdef DEBUG diff --git a/tools/graph2dot.c b/tools/graph2dot.c index fa21ede933..14f0e7a024 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#if HAVE_UNISTD_H #include <unistd.h> /* getopt */ +#endif #include <stdio.h> #include <string.h> @@ -27,6 +30,10 @@ #include "libavutil/audioconvert.h" #include "libavfilter/avfiltergraph.h" +#if !HAVE_GETOPT +#include "compat/getopt.c" +#endif + static void usage(void) { printf("Convert a libavfilter graph to a dot file\n"); diff --git a/tools/ismindex.c b/tools/ismindex.c index 1b69e289d8..b801d43e8d 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -36,8 +36,8 @@ #include <string.h> #include <sys/stat.h> #ifdef _WIN32 -#include <io.h> -#define mkdir(a, b) mkdir(a) +#include <direct.h> +#define mkdir(a, b) _mkdir(a) #endif #include "libavformat/avformat.h" diff --git a/tools/pktdumper.c b/tools/pktdumper.c index 1711210eb4..3fb94f6e9a 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -18,12 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include <limits.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#if HAVE_UNISTD_H #include <unistd.h> +#endif +#if HAVE_IO_H +#include <io.h> +#endif #include "libavutil/time.h" #include "libavformat/avformat.h" diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index bb8e02eac9..ebbe95237c 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -32,6 +32,9 @@ #ifdef __MINGW32__ #define fseeko(x, y, z) fseeko64(x, y, z) #define ftello(x) ftello64(x) +#elif defined(_WIN32) +#define fseeko(x, y, z) _fseeki64(x, y, z) +#define ftello(x) _ftelli64(x) #endif #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) |