[FFmpeg-cvslog] avcodec/libvpxdec: reject video and alpha dimension mismatches

2019-11-05 Thread Marton Balint
ffmpeg | branch: master | Marton Balint  | Sun Oct 27 18:10:36 
2019 +0100| [c54268ce02f71c144d444a5e6d35417d5f043ed5] | committer: James Zern

avcodec/libvpxdec: reject video and alpha dimension mismatches

Signed-off-by: Marton Balint 
Signed-off-by: James Zern 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c54268ce02f71c144d444a5e6d35417d5f043ed5
---

 libavcodec/libvpxdec.c | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index fdd5d458d3..1ae2361167 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -283,6 +283,17 @@ static int vpx_decode(AVCodecContext *avctx,
 return ret;
 }
 
+if (ctx->has_alpha_channel &&
+(img->d_w != img_alpha->d_w ||
+ img->d_h != img_alpha->d_h ||
+ img->bit_depth != img_alpha->bit_depth)) {
+av_log(avctx, AV_LOG_ERROR,
+   "Video dimensions %dx%d@%dbpp differ from alpha dimensions 
%dx%d@%dbpp\n",
+   img->d_w, img->d_h, img->bit_depth,
+   img_alpha->d_w, img_alpha->d_h, img_alpha->bit_depth);
+return AVERROR_INVALIDDATA;
+}
+
 planes[0] = img->planes[VPX_PLANE_Y];
 planes[1] = img->planes[VPX_PLANE_U];
 planes[2] = img->planes[VPX_PLANE_V];

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/libvpxdec: make sure BlockAdditional side data size >= 8

2019-11-05 Thread Marton Balint
ffmpeg | branch: master | Marton Balint  | Sun Oct 27 18:10:33 
2019 +0100| [99e000704690b2b954c18ca585cc56dfd99e9c16] | committer: James Zern

avcodec/libvpxdec: make sure BlockAdditional side data size >= 8

Signed-off-by: Marton Balint 
Signed-off-by: James Zern 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99e000704690b2b954c18ca585cc56dfd99e9c16
---

 libavcodec/libvpxdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 164dbda49b..cc91140886 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -191,7 +191,7 @@ static int vpx_decode(AVCodecContext *avctx,
 side_data = av_packet_get_side_data(avpkt,
 AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
 _data_size);
-if (side_data_size > 1) {
+if (side_data_size >= 8) {
 const uint64_t additional_id = AV_RB64(side_data);
 side_data += 8;
 side_data_size -= 8;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/libvpxdec: decode to custom framebuffers for vp9

2019-11-05 Thread Marton Balint
ffmpeg | branch: master | Marton Balint  | Sun Oct 27 18:10:35 
2019 +0100| [5478e2cc57d1fb73ab49f39c84b23f180bfa39e5] | committer: James Zern

avcodec/libvpxdec: decode to custom framebuffers for vp9

This avoids copying the full frame after decoding.

Signed-off-by: Marton Balint 
Signed-off-by: James Zern 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5478e2cc57d1fb73ab49f39c84b23f180bfa39e5
---

 libavcodec/libvpxdec.c | 73 ++
 1 file changed, 68 insertions(+), 5 deletions(-)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 5c72be5439..fdd5d458d3 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -25,6 +25,7 @@
 
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include 
+#include 
 #include 
 
 #include "libavutil/common.h"
@@ -38,9 +39,46 @@
 typedef struct VPxDecoderContext {
 struct vpx_codec_ctx decoder;
 struct vpx_codec_ctx decoder_alpha;
+AVBufferPool *pool;
+size_t pool_size;
 int has_alpha_channel;
 } VPxContext;
 
+
+static int get_frame_buffer(void *priv, size_t min_size, 
vpx_codec_frame_buffer_t *fb)
+{
+VPxContext *ctx = priv;
+AVBufferRef *buf;
+
+if (min_size > ctx->pool_size) {
+av_buffer_pool_uninit(>pool);
+/* According to the libvpx docs the buffer must be zeroed out. */
+ctx->pool = av_buffer_pool_init(min_size, av_buffer_allocz);
+if (!ctx->pool) {
+ctx->pool_size = 0;
+return AVERROR(ENOMEM);
+}
+ctx->pool_size = min_size;
+}
+
+buf = av_buffer_pool_get(ctx->pool);
+if (!buf)
+return AVERROR(ENOMEM);
+
+fb->priv = buf;
+fb->size = ctx->pool_size;
+fb->data = buf->data;
+
+return 0;
+}
+
+static int release_frame_buffer(void *priv, vpx_codec_frame_buffer_t *fb)
+{
+AVBufferRef *buf = fb->priv;
+av_buffer_unref();
+return 0;
+}
+
 static av_cold int vpx_init(AVCodecContext *avctx,
 struct vpx_codec_ctx* decoder,
 const struct vpx_codec_iface *iface)
@@ -59,6 +97,9 @@ static av_cold int vpx_init(AVCodecContext *avctx,
 return AVERROR(EINVAL);
 }
 
+if (avctx->codec_id == AV_CODEC_ID_VP9)
+vpx_codec_set_frame_buffer_functions(decoder, get_frame_buffer, 
release_frame_buffer, avctx->priv_data);
+
 return 0;
 }
 
@@ -241,8 +282,6 @@ static int vpx_decode(AVCodecContext *avctx,
 if (ret < 0)
 return ret;
 }
-if ((ret = ff_get_buffer(avctx, picture, 0)) < 0)
-return ret;
 
 planes[0] = img->planes[VPX_PLANE_Y];
 planes[1] = img->planes[VPX_PLANE_U];
@@ -254,8 +293,31 @@ static int vpx_decode(AVCodecContext *avctx,
 linesizes[2] = img->stride[VPX_PLANE_V];
 linesizes[3] =
 ctx->has_alpha_channel ? img_alpha->stride[VPX_PLANE_Y] : 0;
-av_image_copy(picture->data, picture->linesize, (const 
uint8_t**)planes,
-  linesizes, avctx->pix_fmt, img->d_w, img->d_h);
+
+if (img->fb_priv && (!ctx->has_alpha_channel || img_alpha->fb_priv)) {
+ret = ff_decode_frame_props(avctx, picture);
+if (ret < 0)
+return ret;
+picture->buf[0] = av_buffer_ref(img->fb_priv);
+if (!picture->buf[0])
+return AVERROR(ENOMEM);
+if (ctx->has_alpha_channel) {
+picture->buf[1] = av_buffer_ref(img_alpha->fb_priv);
+if (!picture->buf[1]) {
+av_frame_unref(picture);
+return AVERROR(ENOMEM);
+}
+}
+for (int i = 0; i < 4; i++) {
+picture->data[i] = planes[i];
+picture->linesize[i] = linesizes[i];
+}
+} else {
+if ((ret = ff_get_buffer(avctx, picture, 0)) < 0)
+return ret;
+av_image_copy(picture->data, picture->linesize, (const 
uint8_t**)planes,
+  linesizes, avctx->pix_fmt, img->d_w, img->d_h);
+}
 *got_frame   = 1;
 }
 return avpkt->size;
@@ -267,6 +329,7 @@ static av_cold int vpx_free(AVCodecContext *avctx)
 vpx_codec_destroy(>decoder);
 if (ctx->has_alpha_channel)
 vpx_codec_destroy(>decoder_alpha);
+av_buffer_pool_uninit(>pool);
 return 0;
 }
 
@@ -307,7 +370,7 @@ AVCodec ff_libvpx_vp9_decoder = {
 .init   = vp9_init,
 .close  = vpx_free,
 .decode = vpx_decode,
-.capabilities   = AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_DR1,
+.capabilities   = AV_CODEC_CAP_AUTO_THREADS,
 .init_static_data = ff_vp9_init_static,
 .profiles   = NULL_IF_CONFIG_SMALL(ff_vp9_profiles),
 .wrapper_name   = "libvpx",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To 

[FFmpeg-cvslog] avcodec/libvpxdec: pass decoder instances to vpx_init directly

2019-11-05 Thread Marton Balint
ffmpeg | branch: master | Marton Balint  | Sun Oct 27 18:10:34 
2019 +0100| [98aa1eb1cb1b354908a064c5265244e789fb8129] | committer: James Zern

avcodec/libvpxdec: pass decoder instances to vpx_init directly

If the alpha decoder init failed we presented the error message from the normal
decoder. This change should prevent such mistakes.

Signed-off-by: Marton Balint 
Signed-off-by: James Zern 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98aa1eb1cb1b354908a064c5265244e789fb8129
---

 libavcodec/libvpxdec.c | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index cc91140886..5c72be5439 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -42,10 +42,9 @@ typedef struct VPxDecoderContext {
 } VPxContext;
 
 static av_cold int vpx_init(AVCodecContext *avctx,
-const struct vpx_codec_iface *iface,
-int is_alpha_decoder)
+struct vpx_codec_ctx* decoder,
+const struct vpx_codec_iface *iface)
 {
-VPxContext *ctx = avctx->priv_data;
 struct vpx_codec_dec_cfg deccfg = {
 .threads = FFMIN(avctx->thread_count ? avctx->thread_count : 
av_cpu_count(), 16)
 };
@@ -53,10 +52,8 @@ static av_cold int vpx_init(AVCodecContext *avctx,
 av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str());
 av_log(avctx, AV_LOG_VERBOSE, "%s\n", vpx_codec_build_config());
 
-if (vpx_codec_dec_init(
-is_alpha_decoder ? >decoder_alpha : >decoder,
-iface, , 0) != VPX_CODEC_OK) {
-const char *error = vpx_codec_error(>decoder);
+if (vpx_codec_dec_init(decoder, iface, , 0) != VPX_CODEC_OK) {
+const char *error = vpx_codec_error(decoder);
 av_log(avctx, AV_LOG_ERROR, "Failed to initialize decoder: %s\n",
error);
 return AVERROR(EINVAL);
@@ -199,15 +196,16 @@ static int vpx_decode(AVCodecContext *avctx,
 if (!ctx->has_alpha_channel) {
 ctx->has_alpha_channel = 1;
 ret = vpx_init(avctx,
+   >decoder_alpha,
 #if CONFIG_LIBVPX_VP8_DECODER && CONFIG_LIBVPX_VP9_DECODER
(avctx->codec_id == AV_CODEC_ID_VP8) ?
-   _codec_vp8_dx_algo : _codec_vp9_dx_algo,
+   _codec_vp8_dx_algo : _codec_vp9_dx_algo
 #elif CONFIG_LIBVPX_VP8_DECODER
-   _codec_vp8_dx_algo,
+   _codec_vp8_dx_algo
 #else
-   _codec_vp9_dx_algo,
+   _codec_vp9_dx_algo
 #endif
-   1);
+   );
 if (ret)
 return ret;
 }
@@ -275,7 +273,8 @@ static av_cold int vpx_free(AVCodecContext *avctx)
 #if CONFIG_LIBVPX_VP8_DECODER
 static av_cold int vp8_init(AVCodecContext *avctx)
 {
-return vpx_init(avctx, _codec_vp8_dx_algo, 0);
+VPxContext *ctx = avctx->priv_data;
+return vpx_init(avctx, >decoder, _codec_vp8_dx_algo);
 }
 
 AVCodec ff_libvpx_vp8_decoder = {
@@ -295,7 +294,8 @@ AVCodec ff_libvpx_vp8_decoder = {
 #if CONFIG_LIBVPX_VP9_DECODER
 static av_cold int vp9_init(AVCodecContext *avctx)
 {
-return vpx_init(avctx, _codec_vp9_dx_algo, 0);
+VPxContext *ctx = avctx->priv_data;
+return vpx_init(avctx, >decoder, _codec_vp9_dx_algo);
 }
 
 AVCodec ff_libvpx_vp9_decoder = {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/libvpxenc: fix alpha stride

2019-11-05 Thread Marton Balint
ffmpeg | branch: master | Marton Balint  | Sun Oct 27 18:10:31 
2019 +0100| [425503291420919a6ef9076298a2f6cbbe47d847] | committer: James Zern

avcodec/libvpxenc: fix alpha stride

Signed-off-by: Marton Balint 
Signed-off-by: James Zern 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=425503291420919a6ef9076298a2f6cbbe47d847
---

 libavcodec/libvpxenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 286baa14a7..4c02315fd2 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -1326,7 +1326,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket 
*pkt,
 rawimg_alpha->planes[VPX_PLANE_U] = u_plane;
 memset(v_plane, 0x80, frame->linesize[2] * frame->height);
 rawimg_alpha->planes[VPX_PLANE_V] = v_plane;
-rawimg_alpha->stride[VPX_PLANE_Y] = frame->linesize[0];
+rawimg_alpha->stride[VPX_PLANE_Y] = frame->linesize[3];
 rawimg_alpha->stride[VPX_PLANE_U] = frame->linesize[1];
 rawimg_alpha->stride[VPX_PLANE_V] = frame->linesize[2];
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/libvpxenc: only allocate alpha U/V planes on size changes

2019-11-05 Thread Marton Balint
ffmpeg | branch: master | Marton Balint  | Sat Nov  2 17:20:21 
2019 +0100| [6b544770729e1a4e91db3825c81c3c7a2254012f] | committer: James Zern

avcodec/libvpxenc: only allocate alpha U/V planes on size changes

Signed-off-by: Marton Balint 
Signed-off-by: James Zern 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b544770729e1a4e91db3825c81c3c7a2254012f
---

 libavcodec/libvpxenc.c | 59 ++
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 4c02315fd2..eb5272a21e 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -347,8 +347,11 @@ static av_cold int vpx_free(AVCodecContext *avctx)
 #endif
 
 vpx_codec_destroy(>encoder);
-if (ctx->is_alpha)
+if (ctx->is_alpha) {
 vpx_codec_destroy(>encoder_alpha);
+av_freep(>rawimg_alpha.planes[VPX_PLANE_U]);
+av_freep(>rawimg_alpha.planes[VPX_PLANE_V]);
+}
 av_freep(>twopass_stats.buf);
 av_freep(>stats_out);
 free_frame_list(ctx->coded_frame_list);
@@ -872,10 +875,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 ctx->rawimg.bit_depth = enccfg.g_bit_depth;
 #endif
 
-if (ctx->is_alpha)
-vpx_img_wrap(>rawimg_alpha, VPX_IMG_FMT_I420, avctx->width, 
avctx->height, 1,
- (unsigned char*)1);
-
 cpb_props = ff_add_cpb_side_data(avctx);
 if (!cpb_props)
 return AVERROR(ENOMEM);
@@ -1292,6 +1291,34 @@ static int vp8_encode_set_roi(AVCodecContext *avctx, int 
frame_width, int frame_
 return ret;
 }
 
+static int realloc_alpha_uv(AVCodecContext *avctx, int width, int height)
+{
+VPxContext *ctx = avctx->priv_data;
+struct vpx_image *rawimg_alpha = >rawimg_alpha;
+unsigned char **planes = rawimg_alpha->planes;
+int *stride = rawimg_alpha->stride;
+
+if (!planes[VPX_PLANE_U] ||
+!planes[VPX_PLANE_V] ||
+width  != (int)rawimg_alpha->d_w ||
+height != (int)rawimg_alpha->d_h) {
+av_freep([VPX_PLANE_U]);
+av_freep([VPX_PLANE_V]);
+
+vpx_img_wrap(rawimg_alpha, VPX_IMG_FMT_I420, width, height, 1,
+ (unsigned char*)1);
+planes[VPX_PLANE_U] = av_malloc_array(stride[VPX_PLANE_U], height);
+planes[VPX_PLANE_V] = av_malloc_array(stride[VPX_PLANE_V], height);
+if (!planes[VPX_PLANE_U] || !planes[VPX_PLANE_V])
+return AVERROR(ENOMEM);
+
+memset(planes[VPX_PLANE_U], 0x80, stride[VPX_PLANE_U] * height);
+memset(planes[VPX_PLANE_V], 0x80, stride[VPX_PLANE_V] * height);
+}
+
+return 0;
+}
+
 static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt,
   const AVFrame *frame, int *got_packet)
 {
@@ -1312,23 +1339,12 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket 
*pkt,
 rawimg->stride[VPX_PLANE_U] = frame->linesize[1];
 rawimg->stride[VPX_PLANE_V] = frame->linesize[2];
 if (ctx->is_alpha) {
-uint8_t *u_plane, *v_plane;
 rawimg_alpha = >rawimg_alpha;
+res = realloc_alpha_uv(avctx, frame->width, frame->height);
+if (res < 0)
+return res;
 rawimg_alpha->planes[VPX_PLANE_Y] = frame->data[3];
-u_plane = av_malloc(frame->linesize[1] * frame->height);
-v_plane = av_malloc(frame->linesize[2] * frame->height);
-if (!u_plane || !v_plane) {
-av_free(u_plane);
-av_free(v_plane);
-return AVERROR(ENOMEM);
-}
-memset(u_plane, 0x80, frame->linesize[1] * frame->height);
-rawimg_alpha->planes[VPX_PLANE_U] = u_plane;
-memset(v_plane, 0x80, frame->linesize[2] * frame->height);
-rawimg_alpha->planes[VPX_PLANE_V] = v_plane;
 rawimg_alpha->stride[VPX_PLANE_Y] = frame->linesize[3];
-rawimg_alpha->stride[VPX_PLANE_U] = frame->linesize[1];
-rawimg_alpha->stride[VPX_PLANE_V] = frame->linesize[2];
 }
 timestamp   = frame->pts;
 #if VPX_IMAGE_ABI_VERSION >= 4
@@ -1390,11 +1406,6 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket 
*pkt,
  ctx->twopass_stats.sz);
 }
 
-if (rawimg_alpha) {
-av_freep(_alpha->planes[VPX_PLANE_U]);
-av_freep(_alpha->planes[VPX_PLANE_V]);
-}
-
 *got_packet = !!coded_size;
 return 0;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/nutenc: Do not pass NULL to memcmp() in get_needed_flags()

2019-11-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Fri 
Nov  1 10:02:29 2019 +0100| [e4fdeb3fcefeb98f2225f7ccded156fb175959c5] | 
committer: Michael Niedermayer

avformat/nutenc: Do not pass NULL to memcmp() in get_needed_flags()

This compared to the other suggestions is cleaner and easier to understand
keeping the condition in the if() simple.

This affects alot of fate tests.

See: [FFmpeg-devel] [PATCH 05/11] avformat/nutenc: Don't pass NULL to memcmp
See: [FFmpeg-devel] [PATCH]lavf/nutenc: Do not call memcmp() with NULL argument

Fixes: Ticket 7980

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4fdeb3fcefeb98f2225f7ccded156fb175959c5
---

 libavformat/nutenc.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index d212f0c245..46dce7722d 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -792,11 +792,12 @@ static int get_needed_flags(NUTContext *nut, 
StreamContext *nus, FrameCode *fc,
 flags |= FLAG_CHECKSUM;
 if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance)
 flags |= FLAG_CHECKSUM;
-if (pkt->size < nut->header_len[fc->header_idx] ||
-(pkt->size > 4096 && fc->header_idx)||
-memcmp(pkt->data, nut->header[fc->header_idx],
-   nut->header_len[fc->header_idx]))
-flags |= FLAG_HEADER_IDX;
+if (fc->header_idx)
+if (pkt->size < nut->header_len[fc->header_idx] ||
+pkt->size > 4096||
+memcmp(pkt->data, nut->header[fc->header_idx],
+  nut->header_len[fc->header_idx]))
+flags |= FLAG_HEADER_IDX;
 
 return flags | (fc->flags & FLAG_CODED);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc/bitstream_filters: Fix copy an paste typo

2019-11-05 Thread Limin Wang
ffmpeg | branch: master | Limin Wang  | Mon Nov  4 
19:09:59 2019 +0800| [377fa6612ae2b47beba02edacc6a22128176dea9] | committer: 
Michael Niedermayer

doc/bitstream_filters: Fix copy an paste typo

Signed-off-by: Limin Wang 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=377fa6612ae2b47beba02edacc6a22128176dea9
---

 doc/bitstream_filters.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi
index 50a1679fc7..8fe5b3ad75 100644
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -598,7 +598,7 @@ Available values are:
 
 @table @samp
 @item auto
-Keep the same transfer characteristics property (default).
+Keep the same colorspace property (default).
 
 @item unknown
 @item bt709

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select bswapdsp for ylc decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:25:31 2019 
-0900| [121326d7b84cd7628dacc8605c541b20d0abddba] | committer: Lou Logan

configure: select bswapdsp for ylc decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=121326d7b84cd7628dacc8605c541b20d0abddba
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 4f185d5c66..bec47d4ffe 100755
--- a/configure
+++ b/configure
@@ -2868,6 +2868,7 @@ wmv3_decoder_select="vc1_decoder"
 wmv3image_decoder_select="wmv3_decoder"
 xma1_decoder_select="wmapro_decoder"
 xma2_decoder_select="wmapro_decoder"
+ylc_decoder_select="bswapdsp"
 zerocodec_decoder_deps="zlib"
 zlib_decoder_deps="zlib"
 zlib_encoder_deps="zlib"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select bswapdsp for mdec decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:20:10 2019 
-0900| [16503a933d5a11f85df09a7b094e872caf31c7fe] | committer: Lou Logan

configure: select bswapdsp for mdec decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16503a933d5a11f85df09a7b094e872caf31c7fe
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 1d6fcffd45..099592a820 100755
--- a/configure
+++ b/configure
@@ -2739,7 +2739,7 @@ ljpeg_encoder_select="idctdsp jpegtables mpegvideoenc"
 lscr_decoder_deps="zlib"
 magicyuv_decoder_select="llviddsp"
 magicyuv_encoder_select="llvidencdsp"
-mdec_decoder_select="blockdsp idctdsp mpegvideo"
+mdec_decoder_select="blockdsp bswapdsp idctdsp mpegvideo"
 metasound_decoder_select="lsp mdct sinewin"
 mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
 mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select fft for qdmc decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:23:41 2019 
-0900| [c69ade947abbd924cd0084a9d2eb27f32792205a] | committer: Lou Logan

configure: select fft for qdmc decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c69ade947abbd924cd0084a9d2eb27f32792205a
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 099592a820..4f185d5c66 100755
--- a/configure
+++ b/configure
@@ -3147,6 +3147,7 @@ mp2_at_decoder_select="mpegaudioheader"
 mp3_at_decoder_select="mpegaudioheader"
 pcm_alaw_at_decoder_deps="audiotoolbox"
 pcm_mulaw_at_decoder_deps="audiotoolbox"
+qdmc_decoder_select="fft"
 qdmc_at_decoder_deps="audiotoolbox"
 qdm2_at_decoder_deps="audiotoolbox"
 aac_at_encoder_deps="audiotoolbox"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select mdct for atrac3al decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:06:22 2019 
-0900| [e8e788da97edf13fcd0edb5c47890d6547aad48e] | committer: Lou Logan

configure: select mdct for atrac3al decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8e788da97edf13fcd0edb5c47890d6547aad48e
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 2291764e98..1d95499ddd 100755
--- a/configure
+++ b/configure
@@ -2658,6 +2658,7 @@ asv2_decoder_select="blockdsp bswapdsp idctdsp"
 asv2_encoder_select="aandcttables bswapdsp fdctdsp pixblockdsp"
 atrac1_decoder_select="mdct sinewin"
 atrac3_decoder_select="mdct"
+atrac3al_decoder_select="mdct"
 atrac3p_decoder_select="mdct sinewin"
 atrac3pal_decoder_select="mdct sinewin"
 atrac9_decoder_select="mdct"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select mdct & sinewin for atrac3pal decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:01:45 2019 
-0900| [e5511bc1bd2e14baf20fc6da380018293bc06a8b] | committer: Lou Logan

configure: select mdct & sinewin for atrac3pal decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5511bc1bd2e14baf20fc6da380018293bc06a8b
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index b3a96c9fd4..2291764e98 100755
--- a/configure
+++ b/configure
@@ -2659,6 +2659,7 @@ asv2_encoder_select="aandcttables bswapdsp fdctdsp 
pixblockdsp"
 atrac1_decoder_select="mdct sinewin"
 atrac3_decoder_select="mdct"
 atrac3p_decoder_select="mdct sinewin"
+atrac3pal_decoder_select="mdct sinewin"
 atrac9_decoder_select="mdct"
 avrn_decoder_select="exif jpegtables"
 bink_decoder_select="blockdsp hpeldsp"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select bswapdsp for imm4 decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:14:41 2019 
-0900| [04e23e027e582210f1b951a4b11c8aa13a361281] | committer: Lou Logan

configure: select bswapdsp for imm4 decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04e23e027e582210f1b951a4b11c8aa13a361281
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 4066d47758..1d6fcffd45 100755
--- a/configure
+++ b/configure
@@ -2726,6 +2726,7 @@ huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp 
llvidencdsp"
 hymt_decoder_select="huffyuv_decoder"
 iac_decoder_select="imc_decoder"
 imc_decoder_select="bswapdsp fft mdct sinewin"
+imm4_decoder_select="bswapdsp"
 imm5_decoder_select="h264_decoder hevc_decoder"
 indeo3_decoder_select="hpeldsp"
 indeo4_decoder_select="ividsp"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/Makefile: add missing ass dependency to ccaption decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:12:24 2019 
-0900| [3bfd12d84c167d601b42d92339bd6b97b3440ea7] | committer: Lou Logan

avcodec/Makefile: add missing ass dependency to ccaption decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bfd12d84c167d601b42d92339bd6b97b3440ea7
---

 libavcodec/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2b6fbbca2a..54862171f9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -242,7 +242,7 @@ OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brenderpix.o
 OBJS-$(CONFIG_C93_DECODER) += c93.o
 OBJS-$(CONFIG_CAVS_DECODER)+= cavs.o cavsdec.o cavsdsp.o \
   cavsdata.o
-OBJS-$(CONFIG_CCAPTION_DECODER)+= ccaption_dec.o
+OBJS-$(CONFIG_CCAPTION_DECODER)+= ccaption_dec.o ass.o
 OBJS-$(CONFIG_CDGRAPHICS_DECODER)  += cdgraphics.o
 OBJS-$(CONFIG_CDXL_DECODER)+= cdxl.o
 OBJS-$(CONFIG_CFHD_DECODER)+= cfhd.o cfhddata.o

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: select audiodsp for acelp_kelvin decoder

2019-11-05 Thread Lou Logan
ffmpeg | branch: master | Lou Logan  | Mon Nov  4 14:10:11 2019 
-0900| [1c7e661adbf3a20c6632f6617a9bd4249a4eaed9] | committer: Lou Logan

configure: select audiodsp for acelp_kelvin decoder

Signed-off-by: Lou Logan 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c7e661adbf3a20c6632f6617a9bd4249a4eaed9
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 1d95499ddd..4066d47758 100755
--- a/configure
+++ b/configure
@@ -2635,6 +2635,7 @@ ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert 
mdct"
 ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
 ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"
 ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"
+acelp_kelvin_decoder_select="audiodsp"
 adpcm_g722_decoder_select="g722dsp"
 adpcm_g722_encoder_select="g722dsp"
 aic_decoder_select="golomb idctdsp"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".