[FFmpeg-cvslog] lavf/format: Remove the dead code in av_probe_input_buffer2.
ffmpeg | branch: master | Jun Zhao | Sun Apr 8 08:09:13
2018 +0800| [053ee996a03b8744af6e12d39e3087efae218b64] | committer: Jun Zhao
lavf/format: Remove the dead code in av_probe_input_buffer2.
Remove the dead code in av_probe_input_buffer2
Signed-off-by: Jun Zhao
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=053ee996a03b8744af6e12d39e3087efae218b64
---
libavformat/format.c | 8
1 file changed, 8 deletions(-)
diff --git a/libavformat/format.c b/libavformat/format.c
index 1c66afb7e6..2c4c895530 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -250,14 +250,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat
**fmt,
*semi = '\0';
}
}
-#if 0
-if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type",
AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) {
-if (!av_strcasecmp(mime_type, "audio/aacp")) {
-*fmt = av_find_input_format("aac");
-}
-av_freep(&mime_type);
-}
-#endif
for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt;
probe_size = FFMIN(probe_size << 1,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/avio: make the logic simple
ffmpeg | branch: master | Jun Zhao | Sun Apr 8 08:05:08
2018 +0800| [4d3e9e31356b4d7d4196f271e19679ea65e51223] | committer: Jun Zhao
avformat/avio: make the logic simple
remove the "ret" to make the code simple and generic.
Signed-off-by: Jun Zhao
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d3e9e31356b4d7d4196f271e19679ea65e51223
---
libavformat/avio.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 63e82872f7..663789ec02 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -663,8 +663,7 @@ int ffurl_shutdown(URLContext *h, int flags)
int ff_check_interrupt(AVIOInterruptCB *cb)
{
-int ret;
-if (cb && cb->callback && (ret = cb->callback(cb->opaque)))
-return ret;
+if (cb && cb->callback)
+return cb->callback(cb->opaque);
return 0;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/bluray: translate a read of 0 to EOF
ffmpeg | branch: master | Jan Ekström | Sun May 6 17:15:52 2018 +0300| [b995ec078f42bac95eda18fbd1b4387477b55d0d] | committer: Jan Ekström lavf/bluray: translate a read of 0 to EOF Yet another case of forgotten 0 =! EOF translation. The libbluray documentation specifically mentions that a read of 0 is EOF. Reported by Fyr on IRC. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b995ec078f42bac95eda18fbd1b4387477b55d0d --- libavformat/bluray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/bluray.c b/libavformat/bluray.c index 9282bf9956..635c4f1b87 100644 --- a/libavformat/bluray.c +++ b/libavformat/bluray.c @@ -198,7 +198,7 @@ static int bluray_read(URLContext *h, unsigned char *buf, int size) len = bd_read(bd->bd, buf, size); -return len; +return len == 0 ? AVERROR_EOF : len; } static int64_t bluray_seek(URLContext *h, int64_t pos, int whence) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add pkg-config check for zlib
ffmpeg | branch: master | Jan Ekström | Sat May 5 21:57:44
2018 +0300| [8d1263fa199ff6dcfc8f0cc94f15f3b429d0c276] | committer: Jan Ekström
configure: add pkg-config check for zlib
It exists, so why not use it? Helps one get rid of additional
search path related flags in addition to PKG_CONFIG_{PATH,LIBDIR}
when utilizing a cross-prefix separate from the sysroot.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d1263fa199ff6dcfc8f0cc94f15f3b429d0c276
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index f78853cc6c..2d99c8ea85 100755
--- a/configure
+++ b/configure
@@ -5933,7 +5933,8 @@ if ! disabled pthreads && ! enabled w32threads && !
enabled os2threads; then
fi
fi
-enabled zlib && check_lib zlib zlib.h zlibVersion-lz
+enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
+ check_lib zlib zlib.h zlibVersion-lz; }
enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion-lbz2
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be done
ffmpeg | branch: master | Michael Niedermayer | Fri
May 4 19:11:36 2018 +0200| [a96c131eb53b00de154f4773d96a3b323ea3daed] |
committer: Michael Niedermayer
avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be done
Fixes: assertion failure
Fixes:
7949/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-4819602782552064
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a96c131eb53b00de154f4773d96a3b323ea3daed
---
libavcodec/jpeg2000dec.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 6aa63a9771..5aa0713ed6 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1159,6 +1159,9 @@ static int
jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
step_x = 32;
step_y = 32;
+if (RSpoc > FFMIN(codsty->nreslevels, REpoc))
+continue;
+
for (reslevelno = RSpoc; reslevelno < FFMIN(codsty->nreslevels,
REpoc); reslevelno++) {
uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; //
==> N_L - r
Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/g2meet: Change order of operations to avoid undefined behavior
ffmpeg | branch: master | Michael Niedermayer | Fri
May 4 18:16:08 2018 +0200| [0a4745145840d97619c424961c1b5c625dbf516c] |
committer: Michael Niedermayer
avcodec/g2meet: Change order of operations to avoid undefined behavior
Fixes: signed integer overflow: 65280 * 196032 cannot be represented in type
'int'
Fixes:
7279/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5977332473921536
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a4745145840d97619c424961c1b5c625dbf516c
---
libavcodec/g2meet.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index b409dae813..5edfb31560 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1356,14 +1356,16 @@ static void g2m_paint_cursor(G2MContext *c, uint8_t
*dst, int stride)
} else {
dst+= x * 3;
}
-if (y < 0) {
+
+if (y < 0)
h += y;
+if (w < 0 || h < 0)
+return;
+if (y < 0) {
cursor += -y * c->cursor_stride;
} else {
dst+= y * stride;
}
-if (w < 0 || h < 0)
-return;
for (j = 0; j < h; j++) {
for (i = 0; i < w; i++) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Reduce the number of tile parts allocated
ffmpeg | branch: master | Michael Niedermayer | Fri
May 4 18:28:07 2018 +0200| [3543522d200f46a9a2782b95c83c031626fd7a04] |
committer: Michael Niedermayer
avcodec/jpeg2000dec: Reduce the number of tile parts allocated
This is large enough for all jpeg2000 files i tested. If some need more then
this
should be changed to dynamic allocation. Dynamic allocation would need to be
done
carefully as these are many relatively small arrays so repeatly reallocating
them
would not be good.
The decrease is a clean and simple solution assuming it works for all files.
Fixes: OOM
Fixes:
6534/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-4821490731057152
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3543522d200f46a9a2782b95c83c031626fd7a04
---
libavcodec/jpeg2000dec.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 5414ce5655..6aa63a9771 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -82,7 +82,7 @@ typedef struct Jpeg2000Tile {
Jpeg2000CodingStyle codsty[4];
Jpeg2000QuantStyle qntsty[4];
Jpeg2000POC poc;
-Jpeg2000TileParttile_part[256];
+Jpeg2000TileParttile_part[32];
uint16_t tp_idx;// Tile-part index
int coord[2][2];// border coordinates {{x0, x1}, {y0,
y1}}
} Jpeg2000Tile;
@@ -761,7 +761,10 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
return AVERROR_INVALIDDATA;
}
-av_assert0(TPsot < FF_ARRAY_ELEMS(s->tile[Isot].tile_part));
+if (TPsot >= FF_ARRAY_ELEMS(s->tile[Isot].tile_part)) {
+avpriv_request_sample(s->avctx, "Too many tile parts");
+return AVERROR_PATCHWELCOME;
+}
s->tile[Isot].tp_idx = TPsot;
tp = s->tile[Isot].tile_part + TPsot;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Fix undefined shift in the jpeg2000_decode_packets_po_iteration() CPRL case
ffmpeg | branch: master | Michael Niedermayer | Fri May 4 19:18:25 2018 +0200| [652ba72ed3124f201f98eea9bafb2232b535f549] | committer: Michael Niedermayer avcodec/jpeg2000dec: Fix undefined shift in the jpeg2000_decode_packets_po_iteration() CPRL case Fixes: shift exponent 47 is too large for 32-bit type 'int' Fixes: 7955/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6016721977606144 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=652ba72ed3124f201f98eea9bafb2232b535f549 --- libavcodec/jpeg2000dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5aa0713ed6..12dcc5c6f5 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1181,10 +1181,10 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 int xc = x / s->cdx[compno]; int yc = y / s->cdy[compno]; -if (yc % (1 << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check +if (yc % (1LL << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check continue; -if (xc % (1 << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check +if (xc % (1LL << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check continue; // check if a precinct exists ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/libzvbi-teletextdec: remove DEBUG code
ffmpeg | branch: master | Marton Balint | Sat Apr 28 21:46:18
2018 +0200| [ab7692ee35945084966311d5e1cf3fcbcbccd5a3] | committer: Marton
Balint
avcodec/libzvbi-teletextdec: remove DEBUG code
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab7692ee35945084966311d5e1cf3fcbcbccd5a3
---
libavcodec/libzvbi-teletextdec.c | 25 -
1 file changed, 25 deletions(-)
diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c
index 44fca17b5d..a800ad34ae 100644
--- a/libavcodec/libzvbi-teletextdec.c
+++ b/libavcodec/libzvbi-teletextdec.c
@@ -70,9 +70,6 @@ typedef struct TeletextContext
int handler_ret;
vbi_decoder * vbi;
-#ifdef DEBUG
-vbi_export *ex;
-#endif
vbi_sliced sliced[MAX_SLICES];
int readorder;
@@ -306,15 +303,6 @@ static void handler(vbi_event *ev, void *user_data)
if (!res)
return;
-#ifdef DEBUG
-fprintf(stderr, "\nSaving res=%d dy0=%d dy1=%d...\n",
-res, page.dirty.y0, page.dirty.y1);
-fflush(stderr);
-
-if (!vbi_export_stdio(ctx->ex, stderr, &page))
-fprintf(stderr, "failed: %s\n", vbi_export_errstr(ctx->ex));
-#endif
-
vpt = vbi_classify_page(ctx->vbi, ev->ev.ttx_page.pgno, &subno, &lang);
chop_top = ctx->chop_top ||
((page.rows > 1) && (vpt == VBI_SUBTITLE_PAGE));
@@ -421,13 +409,6 @@ static int teletext_decode_frame(AVCodecContext *avctx,
void *data, int *data_si
ff_dlog(avctx, "ctx=%p buf_size=%d lines=%u pkt_pts=%7.3f\n",
ctx, pkt->size, lines, (double)pkt->pts/9.0);
if (lines > 0) {
-#ifdef DEBUG
-int i;
-av_log(avctx, AV_LOG_DEBUG, "line numbers:");
-for(i = 0; i < lines; i++)
-av_log(avctx, AV_LOG_DEBUG, " %d", ctx->sliced[i].line);
-av_log(avctx, AV_LOG_DEBUG, "\n");
-#endif
vbi_decode(ctx->vbi, ctx->sliced, lines, 0.0);
ctx->lines_processed += lines;
}
@@ -505,12 +486,6 @@ static int teletext_init_decoder(AVCodecContext *avctx)
if (ctx->opacity == -1)
ctx->opacity = ctx->transparent_bg ? 0 : 255;
-#ifdef DEBUG
-{
-char *t;
-ctx->ex = vbi_export_new("text", &t);
-}
-#endif
av_log(avctx, AV_LOG_VERBOSE, "page filter: %s\n", ctx->pgno);
return (ctx->format_id == 1) ? ff_ass_subtitle_header_default(avctx) : 0;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/libzvbi-teletextdec: allow -1 subtitle duration and make it the default
ffmpeg | branch: master | Marton Balint | Sat Apr 28 19:17:31
2018 +0200| [03038d4da95eaceef887a4c936825fa58841d767] | committer: Marton
Balint
avcodec/libzvbi-teletextdec: allow -1 subtitle duration and make it the default
Most decoders (pgssubdec, ccaption_dec) are using -1 or UINT32_MAX for a
subtitle event which should be cleared at the next event.
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03038d4da95eaceef887a4c936825fa58841d767
---
doc/decoders.texi| 3 ++-
libavcodec/libzvbi-teletextdec.c | 2 +-
libavcodec/version.h | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/decoders.texi b/doc/decoders.texi
index a9510bdf02..a551d5d0fd 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -272,7 +272,8 @@ present between the subtitle lines because of double-sized
teletext characters.
Default value is 1.
@item txt_duration
Sets the display duration of the decoded teletext pages or subtitles in
-milliseconds. Default value is 3 which is 30 seconds.
+milliseconds. Default value is -1 which means infinity or until the next
+subtitle event comes.
@item txt_transparent
Force transparent background of the generated teletext bitmaps. Default value
is 0 which means an opaque background.
diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c
index 30d0593430..44fca17b5d 100644
--- a/libavcodec/libzvbi-teletextdec.c
+++ b/libavcodec/libzvbi-teletextdec.c
@@ -548,7 +548,7 @@ static const AVOption options[] = {
{"txt_left","x offset of generated bitmaps",
OFFSET(x_offset), AV_OPT_TYPE_INT,{.i64 = 0},0, 65535,SD},
{"txt_top", "y offset of generated bitmaps",
OFFSET(y_offset), AV_OPT_TYPE_INT,{.i64 = 0},0, 65535,SD},
{"txt_chop_spaces", "chops leading and trailing spaces from text",
OFFSET(chop_spaces),AV_OPT_TYPE_INT,{.i64 = 1},0, 1,SD},
-{"txt_duration","display duration of teletext pages in msecs",
OFFSET(sub_duration), AV_OPT_TYPE_INT,{.i64 = 3},0, 8640, SD},
+{"txt_duration","display duration of teletext pages in msecs",
OFFSET(sub_duration), AV_OPT_TYPE_INT,{.i64 = -1}, -1, 8640, SD},
{"txt_transparent", "force transparent background of the teletext",
OFFSET(transparent_bg), AV_OPT_TYPE_INT,{.i64 = 0},0, 1,SD},
{"txt_opacity", "set opacity of the transparent background",
OFFSET(opacity),AV_OPT_TYPE_INT,{.i64 = -1}, -1, 255, SD},
{ NULL },
diff --git a/libavcodec/version.h b/libavcodec/version.h
index f368be159d..3fda743cf9 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 19
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add missing dependencies to vf_srcnn
ffmpeg | branch: master | James Almer | Sun May 6 17:15:54 2018 -0300| [652b857b94739df60b1436330ccea6bb2b7c78b3] | committer: James Almer configure: add missing dependencies to vf_srcnn The access dependecy is temporary and should fix compilation with msvc until a proper fix is committed. Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=652b857b94739df60b1436330ccea6bb2b7c78b3 --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 2d99c8ea85..6a69695e32 100755 --- a/configure +++ b/configure @@ -3390,6 +3390,7 @@ spectrumsynth_filter_deps="avcodec" spectrumsynth_filter_select="fft" spp_filter_deps="gpl avcodec" spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp" +srcnn_filter_deps="access avformat" stereo3d_filter_deps="gpl" subtitles_filter_deps="avformat avcodec libass" super2xsai_filter_deps="gpl" @@ -6796,6 +6797,7 @@ enabled signature_filter&& prepend avfilter_deps "avcodec avformat" enabled smartblur_filter&& prepend avfilter_deps "swscale" enabled spectrumsynth_filter && prepend avfilter_deps "avcodec" enabled spp_filter && prepend avfilter_deps "avcodec" +enabled srcnn_filter&& prepend avfilter_deps "avformat" enabled subtitles_filter&& prepend avfilter_deps "avformat avcodec" enabled uspp_filter && prepend avfilter_deps "avcodec" enabled zoompan_filter && prepend avfilter_deps "swscale" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: fix and simplify xlib check
ffmpeg | branch: master | James Almer | Sun May 6 20:45:53 2018 -0300| [0736f32a4facddbd953977ca614a3ee6d8a6e1d7] | committer: James Almer configure: fix and simplify xlib check Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0736f32a4facddbd953977ca614a3ee6d8a6e1d7 --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6a69695e32..7c143238a8 100755 --- a/configure +++ b/configure @@ -3228,8 +3228,7 @@ v4l2_outdev_suggest="libv4l2" vfwcap_indev_deps="vfw32 vfwcap_defines" xcbgrab_indev_deps="libxcb" xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes" -xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute" -xv_outdev_extralibs="-lXv -lX11 -lXext" +xv_outdev_deps="xlib" # protocols async_protocol_deps="threads" @@ -5804,7 +5803,7 @@ check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_func_headers glob.h glob enabled xlib && -check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext +check_lib xlib "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext check_header direct.h check_header dirent.h ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
