June 2012 - ffmpeg-cvslog - lists.ffmpeg.org

aac: reference supported sample rates in encoders.
by git＠videolan.org 06 Nov '12

06 Nov '12

ffmpeg | branch: master | Clément Bœsch <clement.boesch(a)smartjog.com> | Mon Mar 26 22:32:17 2012 +0200| [29679f4a372eb208af31c57177ab49f67c698362] | committer: Clément Bœsch aac: reference supported sample rates in encoders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29679f4a372eb208a… --- libavcodec/aacenc.c | 1 + libavcodec/libvo-aacenc.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index cf4aef9..fd72daf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -816,6 +816,7 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 8f7c581..c5191ec 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -193,6 +193,7 @@ AVCodec ff_libvo_aacenc_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_close, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

3 2

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 22:44:18 2012 +0200| [64b25938e90253432d28ffd7d971f085c560a523] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section. dnxhdenc: add space between function argument type and comment. x86: fmtconvert: add special asm for float_to_int16_interleave_misc_* attributes: Add a definition of av_always_inline for MSVC cmdutils: Pass the actual chosen encoder to filter_codec_opts os_support: Add fallback definitions for stat flags os_support: Rename the poll fallback function to ff_poll network: Check for struct pollfd os_support: Don't compare a negative number against socket descriptors os_support: Include all the necessary headers for the win32 open function x86: vc1: fix and enable optimised loop filter Conflicts: cmdutils.c cmdutils.h ffmpeg.c ffplay.c libavformat/os_support.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64b25938e90253432… ---

1 0

dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Thu Jun 14 22:05:10 2012 +0000| [ceabc13f129cd6344b1eebdbe10119083fe5520e] | committer: Ronald S. Bultje dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ceabc13f129cd6344… --- libavcodec/x86/dsputilenc_mmx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 2a403ba..d8a60e1 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -1127,8 +1127,8 @@ void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) #endif c->pix_norm1 = pix_norm1_mmx; - c->sse[0] = (HAVE_YASM && mm_flags & AV_CPU_FLAG_SSE2) ? ff_sse16_sse2 : sse16_mmx; - c->sse[1] = sse8_mmx; + c->sse[0] = sse16_mmx; + c->sse[1] = sse8_mmx; c->vsad[4]= vsad_intra16_mmx; c->nsse[0] = nsse16_mmx; @@ -1164,10 +1164,13 @@ void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) if (bit_depth <= 8) c->get_pixels = get_pixels_sse2; c->sum_abs_dctelem= sum_abs_dctelem_sse2; -#if HAVE_YASM && HAVE_ALIGNED_STACK +#if HAVE_YASM + c->sse[0] = ff_sse16_sse2; +#if HAVE_ALIGNED_STACK c->hadamard8_diff[0]= ff_hadamard8_diff16_sse2; c->hadamard8_diff[1]= ff_hadamard8_diff_sse2; #endif +#endif } #if HAVE_SSSE3

1 0

dnxhdenc: add space between function argument type and comment.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Thu Jun 14 15:57:26 2012 -0700| [e9156741a763ac7ce48933f489f3e0a13e9a4df7] | committer: Martin Storsjö dnxhdenc: add space between function argument type and comment. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9156741a763ac7ce… --- libavcodec/dnxhdenc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 861546a..7e2f96f 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -92,7 +92,7 @@ typedef struct DNXHDEncContext { RCCMPEntry *mb_cmp; RCEntry (*mb_rc)[8160]; - void (*get_pixels_8x4_sym)(DCTELEM */*align 16*/, const uint8_t *, int); + void (*get_pixels_8x4_sym)(DCTELEM * /*align 16*/, const uint8_t *, int); } DNXHDEncContext; void ff_dnxhd_init_mmx(DNXHDEncContext *ctx);

1 0

x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Thu Jun 14 15:03:08 2012 +0100| [66a02159ea9a09965dfa3e06ea55f41e5f615f90] | committer: Martin Storsjö x86: fmtconvert: add special asm for float_to_int16_interleave_misc_* This gets rid of a variable-length array and a for loop in C code. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66a02159ea9a09965… --- libavcodec/x86/fmtconvert.asm | 78 +++++++++++++++++++++++++++++++++++++++ libavcodec/x86/fmtconvert_mmx.c | 12 +++--- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index 63befc9..4916e7a 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -115,6 +115,84 @@ FLOAT_TO_INT16 sse, 0 FLOAT_TO_INT16 3dnow, 0 %undef cvtps2pi +;------------------------------------------------------------------------------ +; void ff_float_to_int16_step(int16_t *dst, const float *src, long len, long step); +;------------------------------------------------------------------------------ +%macro FLOAT_TO_INT16_STEP 2 +cglobal float_to_int16_step_%1, 4,7,%2, dst, src, len, step, step3, v1, v2 + add lenq, lenq + lea srcq, [srcq+2*lenq] + lea step3q, [stepq*3] + neg lenq +.loop: +%ifidn %1, sse2 + cvtps2dq m0, [srcq+2*lenq ] + cvtps2dq m1, [srcq+2*lenq+16] + packssdw m0, m1 + movd v1d, m0 + psrldq m0, 4 + movd v2d, m0 + psrldq m0, 4 + mov [dstq], v1w + mov [dstq+stepq*4], v2w + shr v1d, 16 + shr v2d, 16 + mov [dstq+stepq*2], v1w + mov [dstq+step3q*2], v2w + lea dstq, [dstq+stepq*8] + movd v1d, m0 + psrldq m0, 4 + movd v2d, m0 + mov [dstq], v1w + mov [dstq+stepq*4], v2w + shr v1d, 16 + shr v2d, 16 + mov [dstq+stepq*2], v1w + mov [dstq+step3q*2], v2w + lea dstq, [dstq+stepq*8] +%else + cvtps2pi m0, [srcq+2*lenq ] + cvtps2pi m1, [srcq+2*lenq+ 8] + cvtps2pi m2, [srcq+2*lenq+16] + cvtps2pi m3, [srcq+2*lenq+24] + packssdw m0, m1 + packssdw m2, m3 + movd v1d, m0 + psrlq m0, 32 + movd v2d, m0 + mov [dstq], v1w + mov [dstq+stepq*4], v2w + shr v1d, 16 + shr v2d, 16 + mov [dstq+stepq*2], v1w + mov [dstq+step3q*2], v2w + lea dstq, [dstq+stepq*8] + movd v1d, m2 + psrlq m2, 32 + movd v2d, m2 + mov [dstq], v1w + mov [dstq+stepq*4], v2w + shr v1d, 16 + shr v2d, 16 + mov [dstq+stepq*2], v1w + mov [dstq+step3q*2], v2w + lea dstq, [dstq+stepq*8] +%endif + add lenq, 16 + js .loop +%ifnidn %1, sse2 + emms +%endif + REP_RET +%endmacro + +INIT_XMM +FLOAT_TO_INT16_STEP sse2, 2 +INIT_MMX +FLOAT_TO_INT16_STEP sse, 0 +%define cvtps2pi pf2id +FLOAT_TO_INT16_STEP 3dnow, 0 +%undef cvtps2pi ;------------------------------------------------------------------------------- ; void ff_float_to_int16_interleave2(int16_t *dst, const float **src, long len); diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c index 42cb0bc..aaf634d 100644 --- a/libavcodec/x86/fmtconvert_mmx.c +++ b/libavcodec/x86/fmtconvert_mmx.c @@ -25,6 +25,7 @@ #include "libavutil/cpu.h" #include "libavutil/x86_cpu.h" #include "libavcodec/fmtconvert.h" +#include "libavcodec/dsputil.h" #if HAVE_YASM @@ -35,6 +36,10 @@ void ff_float_to_int16_3dnow(int16_t *dst, const float *src, long len); void ff_float_to_int16_sse (int16_t *dst, const float *src, long len); void ff_float_to_int16_sse2 (int16_t *dst, const float *src, long len); +void ff_float_to_int16_step_3dnow(int16_t *dst, const float *src, long len, long step); +void ff_float_to_int16_step_sse (int16_t *dst, const float *src, long len, long step); +void ff_float_to_int16_step_sse2 (int16_t *dst, const float *src, long len, long step); + void ff_float_to_int16_interleave2_3dnow(int16_t *dst, const float **src, long len); void ff_float_to_int16_interleave2_sse (int16_t *dst, const float **src, long len); void ff_float_to_int16_interleave2_sse2 (int16_t *dst, const float **src, long len); @@ -48,12 +53,9 @@ void ff_float_to_int16_interleave6_3dn2(int16_t *dst, const float **src, int len #define FLOAT_TO_INT16_INTERLEAVE(cpu) \ /* gcc pessimizes register allocation if this is in the same function as float_to_int16_interleave_sse2*/\ static av_noinline void float_to_int16_interleave_misc_##cpu(int16_t *dst, const float **src, long len, int channels){\ - DECLARE_ALIGNED(16, int16_t, tmp)[len];\ - int i,j,c;\ + int c;\ for(c=0; c<channels; c++){\ - ff_float_to_int16_##cpu(tmp, src[c], len);\ - for(i=0, j=c; i<len; i++, j+=channels)\ - dst[j] = tmp[i];\ + ff_float_to_int16_step_##cpu(dst+c, src[c], len, channels);\ }\ }\ \

1 0

attributes: Add a definition of av_always_inline for MSVC
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sun Jun 24 20:57:14 2012 +0300| [4f2c846d9644640cd881b7a7a48d1785a52f5c25] | committer: Martin Storsjö attributes: Add a definition of av_always_inline for MSVC Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f2c846d9644640cd… --- libavutil/attributes.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/attributes.h b/libavutil/attributes.h index ef990a1..c0bac3f 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -35,6 +35,8 @@ #ifndef av_always_inline #if AV_GCC_VERSION_AT_LEAST(3,1) # define av_always_inline __attribute__((always_inline)) inline +#elif defined(_MSC_VER) +# define av_always_inline __forceinline #else # define av_always_inline inline #endif

1 0

cmdutils: Pass the actual chosen encoder to filter_codec_opts
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Sat Jun 30 01:28:02 2012 +0300| [d3ed1c9571c24d33fc485fba01bc2d6ed4de18b1] | committer: Martin Storsjö cmdutils: Pass the actual chosen encoder to filter_codec_opts This allows passing the right options to encoders when there's more than one encoder for a certain codec id. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3ed1c9571c24d33f… --- avconv.c | 4 ++-- avplay.c | 2 +- cmdutils.c | 9 +++++---- cmdutils.h | 4 +++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/avconv.c b/avconv.c index 3eb249d..3a7cebf 100644 --- a/avconv.c +++ b/avconv.c @@ -3441,7 +3441,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->file_index = nb_input_files; ist->discard = 1; st->discard = AVDISCARD_ALL; - ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st); + ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, NULL); ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); @@ -3768,7 +3768,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e st->codec->codec_type = type; choose_encoder(o, oc, ost); if (ost->enc) { - ost->opts = filter_codec_opts(codec_opts, ost->enc->id, oc, st); + ost->opts = filter_codec_opts(codec_opts, ost->enc->id, oc, st, ost->enc); } avcodec_get_context_defaults3(st->codec, ost->enc); diff --git a/avplay.c b/avplay.c index 6acb6c1..71844c2 100644 --- a/avplay.c +++ b/avplay.c @@ -2081,7 +2081,7 @@ static int stream_component_open(VideoState *is, int stream_index) return -1; avctx = ic->streams[stream_index]->codec; - opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]); + opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], NULL); codec = avcodec_find_decoder(avctx->codec_id); avctx->debug_mv = debug_mv; diff --git a/cmdutils.c b/cmdutils.c index abf89a3..6d13bd6 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -948,18 +948,19 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec) } AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, - AVFormatContext *s, AVStream *st) + AVFormatContext *s, AVStream *st, AVCodec *codec) { AVDictionary *ret = NULL; AVDictionaryEntry *t = NULL; - AVCodec *codec = s->oformat ? avcodec_find_encoder(codec_id) - : avcodec_find_decoder(codec_id); int flags = s->oformat ? AV_OPT_FLAG_ENCODING_PARAM : AV_OPT_FLAG_DECODING_PARAM; char prefix = 0; const AVClass *cc = avcodec_get_class(); if (!codec) + codec = s->oformat ? avcodec_find_encoder(codec_id) + : avcodec_find_decoder(codec_id); + if (!codec) return NULL; switch (codec->type) { @@ -1020,7 +1021,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, } for (i = 0; i < s->nb_streams; i++) opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codec->codec_id, - s, s->streams[i]); + s, s->streams[i], NULL); return opts; } diff --git a/cmdutils.h b/cmdutils.h index 5dac130..793a1e8 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -214,10 +214,12 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec); * * @param s Corresponding format context. * @param st A stream from s for which the options should be filtered. + * @param codec The particular codec for which the options should be filtered. + * If null, the default one is looked up according to the codec id. * @return a pointer to the created dictionary */ AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, - AVFormatContext *s, AVStream *st); + AVFormatContext *s, AVStream *st, AVCodec *codec); /** * Setup AVCodecContext options for avformat_find_stream_info().

1 0

os_support: Add fallback definitions for stat flags
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sun Jun 24 21:21:07 2012 +0300| [5a608a239b8193a420df7b1579999b71aa12f4a8] | committer: Martin Storsjö os_support: Add fallback definitions for stat flags Mingw headers provide similar defines already (unconditional #defines, without any #undef or #ifdef around it), while MSVC doesn't have them. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a608a239b8193a42… --- libavformat/os_support.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index dfb87ef..8e2eb83 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -29,6 +29,8 @@ #include "config.h" +#include <sys/stat.h> + #if defined(__MINGW32__) && !defined(__MINGW32CE__) # include <fcntl.h> # define lseek(f,p,w) _lseeki64((f), (p), (w)) @@ -55,6 +57,13 @@ static inline int is_dos_path(const char *path) #define SHUT_RD SD_RECEIVE #define SHUT_WR SD_SEND #define SHUT_RDWR SD_BOTH + +#ifndef S_IRUSR +#define S_IRUSR S_IREAD +#endif +#ifndef S_IWUSR +#define S_IWUSR S_IWRITE +#endif #endif #if defined(_WIN32) && !defined(__MINGW32CE__)

1 0

os_support: Rename the poll fallback function to ff_poll
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Mon Jun 25 12:27:37 2012 +0300| [cab2eb87f9d692f543d11057dbfac4e590570b18] | committer: Martin Storsjö os_support: Rename the poll fallback function to ff_poll The fallback function is a non-static function, we shouldn't be defining non-static functions outside of the proper ff/av prefix namespaces. This is especially important for a function like poll, which other parties (other libraries, or executables linking these libraries) also might provide similar but incompatible fallbacks for. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cab2eb87f9d692f54… --- libavformat/os_support.c | 2 +- libavformat/os_support.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 49ec0c6..6d8c8ac 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -266,7 +266,7 @@ int ff_socket_nonblock(int socket, int enable) } #if !HAVE_POLL_H -int poll(struct pollfd *fds, nfds_t numfds, int timeout) +int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout) { fd_set read_set; fd_set write_set; diff --git a/libavformat/os_support.h b/libavformat/os_support.h index cda84b0..dfb87ef 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -101,7 +101,8 @@ struct pollfd { #endif -int poll(struct pollfd *fds, nfds_t numfds, int timeout); +int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout); +#define poll ff_poll #endif /* HAVE_POLL_H */ #endif /* CONFIG_NETWORK */

1 0

network: Check for struct pollfd
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Mon Jun 25 12:08:44 2012 +0300| [cdee08e36582e443ff8a9bed17ec409551c9f93b] | committer: Martin Storsjö network: Check for struct pollfd We need to include winsock2.h here, to make sure we have the real pollfd struct definition, if one exists, before defining the fallback poll function. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdee08e36582e443f… --- configure | 3 +++ libavformat/os_support.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/configure b/configure index 1290369..a7ac43f 100755 --- a/configure +++ b/configure @@ -1140,6 +1140,7 @@ HAVE_LIST=" struct_group_source_req struct_ip_mreq_source struct_ipv6_mreq + struct_pollfd struct_rusage_ru_maxrss struct_sockaddr_in6 struct_sockaddr_sa_len @@ -2818,6 +2819,7 @@ if enabled network; then check_type netinet/in.h "struct ip_mreq_source" -D_BSD_SOURCE check_type netinet/in.h "struct ipv6_mreq" -D_DARWIN_C_SOURCE check_type netinet/in.h "struct sockaddr_in6" + check_type poll.h "struct pollfd" check_type "sys/types.h sys/socket.h" "struct sockaddr_storage" check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len check_header netinet/sctp.h @@ -2834,6 +2836,7 @@ if enabled network; then check_type ws2tcpip.h "struct group_source_req" check_type ws2tcpip.h "struct ip_mreq_source" check_type ws2tcpip.h "struct ipv6_mreq" + check_type winsock2.h "struct pollfd" check_type ws2tcpip.h "struct sockaddr_in6" check_type ws2tcpip.h "struct sockaddr_storage" check_struct winsock2.h "struct sockaddr" sa_len diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 3db20a9..cda84b0 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -75,6 +75,10 @@ typedef int socklen_t; #if !HAVE_POLL_H typedef unsigned long nfds_t; +#if HAVE_WINSOCK2_H +#include <winsock2.h> +#endif +#if !HAVE_STRUCT_POLLFD struct pollfd { int fd; short events; /* events to look for */ @@ -94,6 +98,7 @@ struct pollfd { #define POLLERR 0x0004 /* errors pending */ #define POLLHUP 0x0080 /* disconnected */ #define POLLNVAL 0x1000 /* invalid file descriptor */ +#endif int poll(struct pollfd *fds, nfds_t numfds, int timeout);

1 0