October 2013 - ffmpeg-cvslog - lists.ffmpeg.org

atrac: Update copyright info and file description.
by git＠videolan.org 02 Oct '13

02 Oct '13

ffmpeg | branch: master | Maxim Poliakovski <max_pole(a)gmx.de> | Wed Oct 2 01:55:13 2013 +0200| [cc2330fe3a012605ffbbb1bc42d31db0f8273826] | committer: Michael Niedermayer atrac: Update copyright info and file description. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc2330fe3a012605f… --- libavcodec/atrac.c | 5 +++-- libavcodec/atrac.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index c4241a9..9787c84 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -1,6 +1,7 @@ /* - * ATRAC common functions - * Copyright (c) 2006-2008 Maxim Poliakovski + * Common functions for the ATRAC family of decoders + * + * Copyright (c) 2006-2013 Maxim Poliakovski * Copyright (c) 2006-2008 Benjamin Larsson * * This file is part of FFmpeg. diff --git a/libavcodec/atrac.h b/libavcodec/atrac.h index 9041d85..18b4fdd 100644 --- a/libavcodec/atrac.h +++ b/libavcodec/atrac.h @@ -1,6 +1,7 @@ /* - * ATRAC common data - * Copyright (c) 2009 Maxim Poliakovski + * Common functions for the ATRAC family of decoders + * + * Copyright (c) 2009-2013 Maxim Poliakovski * Copyright (c) 2009 Benjamin Larsson * * This file is part of FFmpeg.

1 0

atrac: Add missing av_cold.
by git＠videolan.org 02 Oct '13

02 Oct '13

ffmpeg | branch: master | Maxim Poliakovski <max_pole(a)gmx.de> | Wed Oct 2 01:55:13 2013 +0200| [852241561d040e0b147b5c866fd4f288324fbe48] | committer: Michael Niedermayer atrac: Add missing av_cold. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=852241561d040e0b1… --- libavcodec/atrac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index 3d37b02..c4241a9 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -48,7 +48,7 @@ static const float qmf_48tap_half[24] = { * Generate common tables */ -void ff_atrac_generate_tables(void) +av_cold void ff_atrac_generate_tables(void) { int i; float s;

1 0

avcodec/wmalosslessdec: check block_align
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 2 01:16:11 2013 +0200| [286beebdc34d11a301dfa5189e84f1c399d56133] | committer: Michael Niedermayer avcodec/wmalosslessdec: check block_align Code copied from wmaprodec Fixes null pointer dereference Fixes Ticket3002 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=286beebdc34d11a30… --- libavcodec/wmalosslessdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index df44855..ab764ed 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -178,6 +178,11 @@ static av_cold int decode_init(AVCodecContext *avctx) unsigned int channel_mask; int i, log2_max_num_subframes; + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + s->avctx = avctx; init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE);

1 0

Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" ( configure: Properly set zlib dependencies for all components)
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Oct 1 23:40:19 2013 +0200| [ad8fbddb94c2d7e0fbcd46d508e962bbfd939ba4] | committer: Michael Niedermayer Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" (configure: Properly set zlib dependencies for all components) The reverted commit introduced undefined behavior. undefined in the sense that the evaluation order of the dependencies affects the results Fixes Ticket2920 This reverts commit c32db6adab9942781cc5a23f62abb839a5595a83, reversing changes made to 05f1b4e2ecc4683467669a190e3a53df413de805. Alternative solutions would be to change the dependency solver to handle non trivial dependencies or to enable zlib by default before the dependency solver, this would leave a zlib dependency in the libs though then even when no zlib is needed or used. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad8fbddb94c2d7e0f… --- configure | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/configure b/configure index b82381c..975fae4 100755 --- a/configure +++ b/configure @@ -1776,29 +1776,28 @@ dnxhd_decoder_select="dsputil" dnxhd_encoder_select="aandcttables dsputil mpegvideoenc" dvvideo_decoder_select="dsputil" dvvideo_encoder_select="dsputil" -dxa_decoder_deps="zlib" +dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables dsputil mpegvideo" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" -exr_decoder_deps="zlib" +exr_decoder_select="zlib" ffv1_decoder_select="dsputil golomb rangecoder" ffv1_encoder_select="dsputil rangecoder" ffvhuff_decoder_select="dsputil" ffvhuff_encoder_select="dsputil huffman" flac_decoder_select="golomb" flac_encoder_select="dsputil golomb lpc" -flashsv_decoder_deps="zlib" -flashsv_encoder_deps="zlib" -flashsv2_encoder_deps="zlib" -flashsv2_decoder_deps="zlib" +flashsv_decoder_select="zlib" +flashsv_encoder_select="zlib" +flashsv2_encoder_select="zlib" +flashsv2_decoder_select="zlib" flv_decoder_select="h263_decoder" flv_encoder_select="h263_encoder" fourxm_decoder_select="dsputil" fraps_decoder_select="dsputil huffman" -g2m_decoder_deps="zlib" -g2m_decoder_select="dsputil" +g2m_decoder_select="dsputil zlib" g729_decoder_select="dsputil" h261_decoder_select="error_resilience mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" @@ -1858,9 +1857,8 @@ mxpeg_decoder_select="dsputil hpeldsp exif" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" -png_decoder_deps="zlib" -png_encoder_deps="zlib" -png_encoder_select="dsputil" +png_decoder_select="zlib" +png_encoder_select="dsputil zlib" prores_decoder_select="dsputil" prores_encoder_select="dsputil" qcelp_decoder_select="lsp" @@ -1894,7 +1892,7 @@ thp_decoder_select="dsputil hpeldsp exif" truehd_decoder_select="mlp_parser" truemotion2_decoder_select="dsputil" truespeech_decoder_select="dsputil" -tscc_decoder_deps="zlib" +tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_decoder_select="dsputil" utvideo_encoder_select="dsputil huffman" @@ -1922,11 +1920,11 @@ wmv2_decoder_select="h263_decoder videodsp" wmv2_encoder_select="h263_encoder" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" -zerocodec_decoder_deps="zlib" -zlib_decoder_deps="zlib" -zlib_encoder_deps="zlib" -zmbv_decoder_deps="zlib" -zmbv_encoder_deps="zlib" +zerocodec_decoder_select="zlib" +zlib_decoder_select="zlib" +zlib_encoder_select="zlib" +zmbv_decoder_select="zlib" +zmbv_encoder_select="zlib" # hardware accelerators crystalhd_deps="libcrystalhd_libcrystalhd_if_h"

1 0

avfilter/vf_histogram: change order of histograms for planar rgb
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 21:22:22 2013 +0000| [edadda968c249bd10d412704cf305b1565fd3f7c] | committer: Paul B Mahol avfilter/vf_histogram: change order of histograms for planar rgb Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edadda968c249bd10… --- doc/filters.texi | 2 +- libavfilter/vf_histogram.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 93cdad8..efadaf1 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -4698,7 +4698,7 @@ It accepts the following values: @item levels standard histogram that display color components distribution in an image. Displays color graph for each color component. Shows distribution -of the Y, U, V, A or G, B, R components, depending on input format, +of the Y, U, V, A or R, G, B components, depending on input format, in current frame. Bellow each graph is color component scale meter. @item color diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 8a98bc7..273d03b 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -248,12 +248,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) switch (h->mode) { case MODE_LEVELS: for (k = 0; k < h->ncomp; k++) { + const int p = h->desc->comp[k].plane; int start = k * (h->level_height + h->scale_height) * h->display_mode; double max_hval_log; unsigned max_hval = 0; for (i = 0; i < in->height; i++) { - src = in->data[k] + i * in->linesize[k]; + src = in->data[p] + i * in->linesize[p]; for (j = 0; j < in->width; j++) h->histogram[src[j]]++; } @@ -275,11 +276,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (l = 0; l < h->ncomp; l++) out->data[l][(j + start) * out->linesize[l] + i] = h->fg_color[l]; } else { - out->data[k][(j + start) * out->linesize[k] + i] = 255; + out->data[p][(j + start) * out->linesize[p] + i] = 255; } } for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--) - out->data[k][(j + start) * out->linesize[k] + i] = i; + out->data[p][(j + start) * out->linesize[p] + i] = i; } memset(h->histogram, 0, 256 * sizeof(unsigned));

1 0

avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Tue Oct 1 20:39:03 2013 +0000| [cac9af68a42c1c8519168fdd6c5230745949dc58] | committer: Paul B Mahol avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cac9af68a42c1c851… --- libavfilter/vf_histogram.c | 37 ++++++++++++++++++++++++++++++------- tests/fate/filter-video.mak | 2 +- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index dc5aa10..8a98bc7 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -87,6 +87,18 @@ static const enum AVPixelFormat levels_pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; +static const enum AVPixelFormat waveform_pix_fmts[] = { + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, + AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, + AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, + AV_PIX_FMT_GRAY8, + AV_PIX_FMT_NONE +}; + static int query_formats(AVFilterContext *ctx) { HistogramContext *h = ctx->priv; @@ -94,6 +106,8 @@ static int query_formats(AVFilterContext *ctx) switch (h->mode) { case MODE_WAVEFORM: + pix_fmts = waveform_pix_fmts; + break; case MODE_LEVELS: pix_fmts = levels_pix_fmts; break; @@ -175,8 +189,11 @@ static void gen_waveform(HistogramContext *h, AVFrame *inpicref, AVFrame *outpic uint8_t *dst_data = outpicref->data[plane] + (col_mode ? offset * dst_linesize : offset); uint8_t * const dst_line = dst_data; const uint8_t max = 255 - intensity; - const int src_h = inpicref->height; - const int src_w = inpicref->width; + const int is_chroma = (component == 1 || component == 2); + const int shift_w = (is_chroma ? h->desc->log2_chroma_w : 0); + const int shift_h = (is_chroma ? h->desc->log2_chroma_h : 0); + const int src_h = FF_CEIL_RSHIFT(inpicref->height, shift_h); + const int src_w = FF_CEIL_RSHIFT(inpicref->width, shift_w); uint8_t *dst, *p; int y; @@ -186,9 +203,9 @@ static void gen_waveform(HistogramContext *h, AVFrame *inpicref, AVFrame *outpic for (p = src_data; p < src_data_end; p++) { uint8_t *target; if (col_mode) - target = dst++ + dst_linesize * *p; + target = dst++ + dst_linesize * (*p >> shift_h); else - target = dst_data + *p; + target = dst_data + (*p >> shift_w); if (*target <= max) *target += intensity; else @@ -218,9 +235,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) out->pts = in->pts; - for (k = 0; k < h->ncomp; k++) - for (i = 0; i < outlink->h; i++) - memset(out->data[k] + i * out->linesize[k], h->bg_color[k], outlink->w); + for (k = 0; k < h->ncomp; k++) { + int is_chroma = (k == 1 || k == 2); + int dst_h = FF_CEIL_RSHIFT(outlink->h, (is_chroma ? h->desc->log2_chroma_h : 0)); + int dst_w = FF_CEIL_RSHIFT(outlink->w, (is_chroma ? h->desc->log2_chroma_w : 0)); + for (i = 0; i < dst_h ; i++) + memset(out->data[h->desc->comp[k].plane] + + i * out->linesize[h->desc->comp[k].plane], + h->bg_color[k], dst_w); + } switch (h->mode) { case MODE_LEVELS: diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 1ba3beb..6d99ef2 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -57,7 +57,7 @@ FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels fate-filter-histogram-levels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram -flags +bitexact -sws_flags +accurate_rnd+bitexact FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-waveform -fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram=mode=waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact +fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=yuv444p,histogram=mode=waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay fate-filter-overlay: tests/data/filtergraphs/overlay

1 0

avfilter/vf_histogram: improve waveform speed
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Tue Oct 1 21:53:57 2013 +0200| [31a8461d6462268810de9c0aca23825dcbe40168] | committer: Paul B Mahol avfilter/vf_histogram: improve waveform speed Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31a8461d646226881… --- libavfilter/vf_histogram.c | 71 +++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index db52199..dc5aa10 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -48,6 +48,7 @@ typedef struct HistogramContext { int waveform_mode; int display_mode; int levels_mode; + const AVPixFmtDescriptor *desc; } HistogramContext; #define OFFSET(x) offsetof(HistogramContext, x) @@ -117,9 +118,9 @@ static const uint8_t white_gbrp_color[4] = { 255, 255, 255, 255 }; static int config_input(AVFilterLink *inlink) { HistogramContext *h = inlink->dst->priv; - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); - h->ncomp = desc->nb_components; + h->desc = av_pix_fmt_desc_get(inlink->format); + h->ncomp = h->desc->nb_components; switch (inlink->format) { case AV_PIX_FMT_GBRAP: @@ -164,6 +165,41 @@ static int config_output(AVFilterLink *outlink) return 0; } +static void gen_waveform(HistogramContext *h, AVFrame *inpicref, AVFrame *outpicref, + int component, int intensity, int offset, int col_mode) +{ + const int plane = h->desc->comp[component].plane; + const int src_linesize = inpicref->linesize[plane]; + const int dst_linesize = outpicref->linesize[plane]; + uint8_t *src_data = inpicref->data[plane]; + uint8_t *dst_data = outpicref->data[plane] + (col_mode ? offset * dst_linesize : offset); + uint8_t * const dst_line = dst_data; + const uint8_t max = 255 - intensity; + const int src_h = inpicref->height; + const int src_w = inpicref->width; + uint8_t *dst, *p; + int y; + + for (y = 0; y < src_h; y++) { + const uint8_t *src_data_end = src_data + src_w; + dst = dst_line; + for (p = src_data; p < src_data_end; p++) { + uint8_t *target; + if (col_mode) + target = dst++ + dst_linesize * *p; + else + target = dst_data + *p; + if (*target <= max) + *target += intensity; + else + *target = 255; + } + src_data += src_linesize; + dst_data += dst_linesize; + } +} + + static int filter_frame(AVFilterLink *inlink, AVFrame *in) { HistogramContext *h = inlink->dst->priv; @@ -227,34 +263,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } break; case MODE_WAVEFORM: - if (h->waveform_mode) { - for (k = 0; k < h->ncomp; k++) { - int offset = k * 256 * h->display_mode; - for (i = 0; i < inlink->w; i++) { - for (j = 0; j < inlink->h; j++) { - int pos = (offset + - in->data[k][j * in->linesize[k] + i]) * - out->linesize[k] + i; - unsigned value = out->data[k][pos]; - value = FFMIN(value + h->step, 255); - out->data[k][pos] = value; - } - } - } - } else { - for (k = 0; k < h->ncomp; k++) { - int offset = k * 256 * h->display_mode; - for (i = 0; i < inlink->h; i++) { - src = in ->data[k] + i * in ->linesize[k]; - dst = out->data[k] + i * out->linesize[k]; - for (j = 0; j < inlink->w; j++) { - int pos = src[j] + offset; - unsigned value = dst[pos]; - value = FFMIN(value + h->step, 255); - dst[pos] = value; - } - } - } + for (k = 0; k < h->ncomp; k++) { + int offset = k * 256 * h->display_mode; + gen_waveform(h, in, out, k, h->step, offset, h->waveform_mode); } break; case MODE_COLOR:

1 0

avcodec/fraps: increase vlc nb_bits
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Sep 28 20:45:51 2013 +0200| [795eaf8d698d46ea59dd9c9f7971f67a25015c0d] | committer: Michael Niedermayer avcodec/fraps: increase vlc nb_bits This should fix decoding the file in: http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078 No i dont have the file so i cant test Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=795eaf8d698d46ea5… --- libavcodec/fraps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 8334afc..60c579d 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -40,6 +40,7 @@ #include "thread.h" #define FPS_TAG MKTAG('F', 'P', 'S', 'x') +#define VLC_BITS 11 /** * local variable storage @@ -94,7 +95,7 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, for (i = 0; i < 256; i++) nodes[i].count = bytestream_get_le32(&src); size -= 1024; - if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, FF_HUFFMAN_BITS, + if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, VLC_BITS, nodes, huff_cmp, FF_HUFFMAN_FLAG_ZERO_COUNT)) < 0) return ret; @@ -106,7 +107,7 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, init_get_bits(&gb, s->tmpbuf, size * 8); for (j = 0; j < h; j++) { for (i = 0; i < w*step; i += step) { - dst[i] = get_vlc2(&gb, vlc.table, FF_HUFFMAN_BITS, 3); + dst[i] = get_vlc2(&gb, vlc.table, VLC_BITS, 3); /* lines are stored as deltas between previous lines * and we need to add 0x80 to the first lines of chroma planes */

1 0

configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004.
by git＠videolan.org 01 Oct '13

01 Oct '13

ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann(a)mail.de> | Tue Oct 1 16:49:39 2013 +0200| [d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00] | committer: Michael Niedermayer configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004. Signed-off-by: Thilo Borgmann <thilo.borgmann(a)mail.de> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3a03d90a3d57cdc6… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index bea3172..b82381c 100755 --- a/configure +++ b/configure @@ -4286,7 +4286,7 @@ enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lO enabled opencl && { check_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || check_lib2 CL/cl.h clEnqueueNDRangeKernel -lOpenCL || die "ERROR: opencl not found"; } && - { enabled_any w32threads os2threads && + { ! enabled_any w32threads os2threads || die "opencl currently needs --enable-pthreads or --disable-w32threads"; } && { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||

1 0