Go to most recent revision | Details | Last modification | View Log | RSS feed
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 1680 | serge | 1 | Index: libavcodec/utils.c |
| 2 | =================================================================== |
||
| 3 | --- libavcodec/utils.c (revision 25603) |
||
| 4 | +++ libavcodec/utils.c (working copy) |
||
| 5 | @@ -1071,27 +1071,33 @@ |
||
| 6 | * and opened file name in **filename. */ |
||
| 7 | int av_tempfile(char *prefix, char **filename) { |
||
| 8 | int fd=-1; |
||
| 9 | -#if !HAVE_MKSTEMP |
||
| 10 | - *filename = tempnam(".", prefix); |
||
| 11 | -#else |
||
| 12 | +//#if !defined(HAVE_MKSTEMP) |
||
| 13 | +// *filename = tempnam(".", prefix); |
||
| 14 | +//#else |
||
| 15 | size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */ |
||
| 16 | *filename = av_malloc(len); |
||
| 17 | -#endif |
||
| 18 | +//#endif |
||
| 19 | /* -----common section-----*/ |
||
| 20 | if (*filename == NULL) { |
||
| 21 | av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n"); |
||
| 22 | return -1; |
||
| 23 | } |
||
| 24 | -#if !HAVE_MKSTEMP |
||
| 25 | +//#if !defined(HAVE_MKSTEMP) |
||
| 26 | +// fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444); |
||
| 27 | +//#else |
||
| 28 | + |
||
| 29 | +// snprintf(*filename, len, "/tmp/%sXXXXXX", prefix); |
||
| 30 | +// fd = mkstemp(*filename); |
||
| 31 | +// if (fd < 0) { |
||
| 32 | +// snprintf(*filename, len, "./%sXXXXXX", prefix); |
||
| 33 | +// fd = mkstemp(*filename); |
||
| 34 | +// } |
||
| 35 | + |
||
| 36 | + |
||
| 37 | + snprintf(*filename, len, "%sXXXXXX", prefix); |
||
| 38 | fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444); |
||
| 39 | -#else |
||
| 40 | - snprintf(*filename, len, "/tmp/%sXXXXXX", prefix); |
||
| 41 | - fd = mkstemp(*filename); |
||
| 42 | - if (fd < 0) { |
||
| 43 | - snprintf(*filename, len, "./%sXXXXXX", prefix); |
||
| 44 | - fd = mkstemp(*filename); |
||
| 45 | - } |
||
| 46 | -#endif |
||
| 47 | + |
||
| 48 | +//#endif |
||
| 49 | /* -----common section-----*/ |
||
| 50 | if (fd < 0) { |
||
| 51 | av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename); |
||
| 52 | Index: libavcodec/vorbis.c |
||
| 53 | =================================================================== |
||
| 54 | --- libavcodec/vorbis.c (revision 25603) |
||
| 55 | +++ libavcodec/vorbis.c (working copy) |
||
| 56 | @@ -23,6 +23,7 @@ |
||
| 57 | #undef V_DEBUG |
||
| 58 | //#define V_DEBUG |
||
| 59 | |||
| 60 | +#include |
||
| 61 | #define ALT_BITSTREAM_READER_LE |
||
| 62 | #include "avcodec.h" |
||
| 63 | #include "get_bits.h" |
||
| 64 | Index: libavformat/avio.c |
||
| 65 | =================================================================== |
||
| 66 | --- libavformat/avio.c (revision 25603) |
||
| 67 | +++ libavformat/avio.c (working copy) |
||
| 68 | @@ -174,7 +174,7 @@ |
||
| 69 | if (fast_retries) |
||
| 70 | fast_retries--; |
||
| 71 | else |
||
| 72 | - usleep(1000); |
||
| 73 | + /*usleep(1000)*/; |
||
| 74 | } else if (ret < 1) |
||
| 75 | return ret < 0 ? ret : len; |
||
| 76 | if (ret) |
||
| 77 | Index: libswscale/swscale.c |
||
| 78 | =================================================================== |
||
| 79 | --- libswscale/swscale.c (revision 25603) |
||
| 80 | +++ libswscale/swscale.c (working copy) |
||
| 81 | @@ -1834,7 +1834,7 @@ |
||
| 82 | * swscale wrapper, so we don't need to export the SwsContext. |
||
| 83 | * Assumes planar YUV to be in YUV order instead of YVU. |
||
| 84 | */ |
||
| 85 | -int sws_scale(SwsContext *c, const uint8_t* const src[], const int srcStride[], int srcSliceY, |
||
| 86 | +int sws_scale(SwsContext *c, uint8_t* src[], const int srcStride[], int srcSliceY, |
||
| 87 | int srcSliceH, uint8_t* const dst[], const int dstStride[]) |
||
| 88 | { |
||
| 89 | int i; |
||
| 90 | Index: libswscale/swscale.h |
||
| 91 | =================================================================== |
||
| 92 | --- libswscale/swscale.h (revision 25603) |
||
| 93 | +++ libswscale/swscale.h (working copy) |
||
| 94 | @@ -192,7 +192,7 @@ |
||
| 95 | * the destination image |
||
| 96 | * @return the height of the output slice |
||
| 97 | */ |
||
| 98 | -int sws_scale(struct SwsContext *context, const uint8_t* const srcSlice[], const int srcStride[], |
||
| 99 | +int sws_scale(struct SwsContext *context, uint8_t* srcSlice[], const int srcStride[], |
||
| 100 | int srcSliceY, int srcSliceH, uint8_t* const dst[], const int dstStride[]); |
||
| 101 | #if LIBSWSCALE_VERSION_MAJOR < 1 |
||
| 102 | /** |
||
| 103 | Index: libswscale/utils.c |
||
| 104 | =================================================================== |
||
| 105 | --- libswscale/utils.c (revision 25603) |
||
| 106 | +++ libswscale/utils.c (working copy) |
||
| 107 | @@ -24,6 +24,8 @@ |
||
| 108 | #include |
||
| 109 | #include |
||
| 110 | #include "config.h" |
||
| 111 | +#undef HAVE_VIRTUALALLOC |
||
| 112 | +#define HAVE_VIRTUALALLOC 0 |
||
| 113 | #include |
||
| 114 | #if HAVE_SYS_MMAN_H |
||
| 115 | #include |