[FFmpeg-cvslog] avformat/xwma: return always proper error codes
ffmpeg | branch: master | Paul B Mahol | Thu Mar 19 10:58:07
2020 +0100| [f5f6fbb6b2e597b582ec4ec71d6ffefb777a4c71] | committer: Paul B Mahol
avformat/xwma: return always proper error codes
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5f6fbb6b2e597b582ec4ec71d6ffefb777a4c71
---
libavformat/xwma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index b5dcb850c0..5a57caa841 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -60,16 +60,16 @@ static int xwma_read_header(AVFormatContext *s)
/* check RIFF header */
tag = avio_rl32(pb);
if (tag != MKTAG('R', 'I', 'F', 'F'))
-return -1;
+return AVERROR_INVALIDDATA;
avio_rl32(pb); /* file size */
tag = avio_rl32(pb);
if (tag != MKTAG('X', 'W', 'M', 'A'))
-return -1;
+return AVERROR_INVALIDDATA;
/* parse fmt header */
tag = avio_rl32(pb);
if (tag != MKTAG('f', 'm', 't', ' '))
-return -1;
+return AVERROR_INVALIDDATA;
size = avio_rl32(pb);
st = avformat_new_stream(s, NULL);
if (!st)
___
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] avutil/hwcontext_cuda: add YUVA420P pixel format
ffmpeg | branch: master | Yaroslav Pogrebnyak | Thu Mar
19 13:08:20 2020 +0100| [08d46cb58659af9d9f2bd2ef22d78ba512e7950c] | committer:
Timo Rothenpieler
avutil/hwcontext_cuda: add YUVA420P pixel format
Signed-off-by: Timo Rothenpieler
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08d46cb58659af9d9f2bd2ef22d78ba512e7950c
---
libavutil/hwcontext_cuda.c | 3 ++-
libavutil/version.h| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
index a87c280cf7..4add65e009 100644
--- a/libavutil/hwcontext_cuda.c
+++ b/libavutil/hwcontext_cuda.c
@@ -39,6 +39,7 @@ typedef struct CUDAFramesContext {
static const enum AVPixelFormat supported_formats[] = {
AV_PIX_FMT_NV12,
AV_PIX_FMT_YUV420P,
+AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_YUV444P,
AV_PIX_FMT_P010,
AV_PIX_FMT_P016,
@@ -274,7 +275,7 @@ static int cuda_transfer_data_to(AVHWFramesContext *ctx,
AVFrame *dst,
.srcPitch = src->linesize[i],
.dstPitch = dst->linesize[i],
.WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]),
-.Height= src->height >> (i ? priv->shift_height : 0),
+.Height= src->height >> ((i == 0 || i == 3) ? 0 :
priv->shift_height),
};
ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream));
diff --git a/libavutil/version.h b/libavutil/version.h
index 8c4f91bb8f..fb66893a65 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 42
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
___
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/yuv4mpegdec: add support for 444alpha
ffmpeg | branch: master | Paul B Mahol | Thu Mar 19 11:11:24
2020 +0100| [c693e7b05336ada9cbc71882b83e33d6632ef5b1] | committer: Paul B Mahol
avformat/yuv4mpegdec: add support for 444alpha
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c693e7b05336ada9cbc71882b83e33d6632ef5b1
---
libavformat/yuv4mpegdec.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c
index addc03057e..980de7d145 100644
--- a/libavformat/yuv4mpegdec.c
+++ b/libavformat/yuv4mpegdec.c
@@ -124,9 +124,7 @@ static int yuv4_read_header(AVFormatContext *s)
} else if (strncmp("422", tokstart, 3) == 0) {
pix_fmt = AV_PIX_FMT_YUV422P;
} else if (strncmp("444alpha", tokstart, 8) == 0 ) {
-av_log(s, AV_LOG_ERROR, "Cannot handle 4:4:4:4 "
- "YUV4MPEG stream.\n");
-return -1;
+pix_fmt = AV_PIX_FMT_YUVA444P;
} else if (strncmp("444", tokstart, 3) == 0) {
pix_fmt = AV_PIX_FMT_YUV444P;
} else if (strncmp("mono16", tokstart, 6) == 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/yuv4mpegdec: use proper error codes
ffmpeg | branch: master | Paul B Mahol | Thu Mar 19 11:08:42
2020 +0100| [4eb5dfb52e3fc31c917b3d5adae24116b5bf2ef3] | committer: Paul B Mahol
avformat/yuv4mpegdec: use proper error codes
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eb5dfb52e3fc31c917b3d5adae24116b5bf2ef3
---
libavformat/yuv4mpegdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c
index a11567e5ca..addc03057e 100644
--- a/libavformat/yuv4mpegdec.c
+++ b/libavformat/yuv4mpegdec.c
@@ -142,7 +142,7 @@ static int yuv4_read_header(AVFormatContext *s)
} else {
av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown "
"pixel format.\n");
-return -1;
+return AVERROR_INVALIDDATA;
}
while (tokstart < header_end && *tokstart != 0x20)
tokstart++;
@@ -240,7 +240,7 @@ static int yuv4_read_header(AVFormatContext *s)
if (width == -1 || height == -1) {
av_log(s, AV_LOG_ERROR, "YUV4MPEG has invalid header.\n");
-return -1;
+return AVERROR_INVALIDDATA;
}
if (pix_fmt == AV_PIX_FMT_NONE) {
___
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] avutil/hwcontext_cuda: combine transfer functions
ffmpeg | branch: master | Timo Rothenpieler | Thu Mar
19 17:35:59 2020 +0100| [d9a37af070abd3869b11c830e1c90466b0cabb9c] | committer:
Timo Rothenpieler
avutil/hwcontext_cuda: combine transfer functions
Gets rid of some mostly duplicated code and adds the ability to do
hardware to hardware transfers.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9a37af070abd3869b11c830e1c90466b0cabb9c
---
libavutil/hwcontext_cuda.c | 78 ++
1 file changed, 23 insertions(+), 55 deletions(-)
diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
index 4add65e009..95402a1460 100644
--- a/libavutil/hwcontext_cuda.c
+++ b/libavutil/hwcontext_cuda.c
@@ -201,8 +201,8 @@ static int cuda_transfer_get_formats(AVHWFramesContext *ctx,
return 0;
}
-static int cuda_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
- const AVFrame *src)
+static int cuda_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
+ const AVFrame *src)
{
CUDAFramesContext *priv = ctx->internal->priv;
AVHWDeviceContext *device_ctx = ctx->device_ctx;
@@ -212,73 +212,41 @@ static int cuda_transfer_data_from(AVHWFramesContext
*ctx, AVFrame *dst,
CUcontext dummy;
int i, ret;
-/* We don't support transfers to HW devices. */
-if (dst->hw_frames_ctx)
-return AVERROR(ENOSYS);
-
ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
if (ret < 0)
return ret;
for (i = 0; i < FF_ARRAY_ELEMS(src->data) && src->data[i]; i++) {
CUDA_MEMCPY2D cpy = {
-.srcMemoryType = CU_MEMORYTYPE_DEVICE,
-.dstMemoryType = CU_MEMORYTYPE_HOST,
-.srcDevice = (CUdeviceptr)src->data[i],
-.dstHost = dst->data[i],
.srcPitch = src->linesize[i],
.dstPitch = dst->linesize[i],
.WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]),
-.Height= src->height >> (i ? priv->shift_height : 0),
+.Height= src->height >> ((i == 0 || i == 3) ? 0 :
priv->shift_height),
};
+if (src->hw_frames_ctx) {
+cpy.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+cpy.srcDevice = (CUdeviceptr)src->data[i];
+} else {
+cpy.srcMemoryType = CU_MEMORYTYPE_HOST;
+cpy.srcHost = src->data[i];
+}
+
+if (dst->hw_frames_ctx) {
+cpy.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+cpy.dstDevice = (CUdeviceptr)dst->data[i];
+} else {
+cpy.dstMemoryType = CU_MEMORYTYPE_HOST;
+cpy.dstHost = dst->data[i];
+}
+
ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream));
if (ret < 0)
goto exit;
}
-ret = CHECK_CU(cu->cuStreamSynchronize(hwctx->stream));
-if (ret < 0)
-goto exit;
-
-exit:
-CHECK_CU(cu->cuCtxPopCurrent(&dummy));
-
-return 0;
-}
-
-static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
- const AVFrame *src)
-{
-CUDAFramesContext *priv = ctx->internal->priv;
-AVHWDeviceContext *device_ctx = ctx->device_ctx;
-AVCUDADeviceContext*hwctx = device_ctx->hwctx;
-CudaFunctions *cu = hwctx->internal->cuda_dl;
-
-CUcontext dummy;
-int i, ret;
-
-/* We don't support transfers from HW devices. */
-if (src->hw_frames_ctx)
-return AVERROR(ENOSYS);
-
-ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
-if (ret < 0)
-return ret;
-
-for (i = 0; i < FF_ARRAY_ELEMS(src->data) && src->data[i]; i++) {
-CUDA_MEMCPY2D cpy = {
-.srcMemoryType = CU_MEMORYTYPE_HOST,
-.dstMemoryType = CU_MEMORYTYPE_DEVICE,
-.srcHost = src->data[i],
-.dstDevice = (CUdeviceptr)dst->data[i],
-.srcPitch = src->linesize[i],
-.dstPitch = dst->linesize[i],
-.WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]),
-.Height= src->height >> ((i == 0 || i == 3) ? 0 :
priv->shift_height),
-};
-
-ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream));
+if (!dst->hw_frames_ctx) {
+ret = CHECK_CU(cu->cuStreamSynchronize(hwctx->stream));
if (ret < 0)
goto exit;
}
@@ -522,8 +490,8 @@ const HWContextType ff_hwcontext_type_cuda = {
.frames_init = cuda_frames_init,
.frames_get_buffer= cuda_get_buffer,
.transfer_get_formats = cuda_transfer_get_formats,
-.transfer_data_to = cuda_transfer_data_to,
-.transfer_data_from = cuda_transfer_data_from,
+.transfer_data_to = cuda_transfer_data,
+.transfer_data_from = cuda_transfer_data,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_CUDA,
AV_PIX_FMT_NONE },
};
_
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 467d5ee web/download: update min. kernel version for linux binaries
The branch, master has been updated via 467d5eef95053f919a5a6bfa98aa30e582c9922f (commit) from eb3ea7e3628825ef2963d72757b1494010a57835 (commit) - Log - commit 467d5eef95053f919a5a6bfa98aa30e582c9922f Author: Gyan Doshi AuthorDate: Sat Mar 14 12:00:50 2020 +0530 Commit: Lou Logan CommitDate: Thu Mar 19 10:55:32 2020 -0800 web/download: update min. kernel version for linux binaries As per https://johnvansickle.com/ffmpeg/ diff --git a/src/download b/src/download index 6292a7e..d9155ee 100644 --- a/src/download +++ b/src/download @@ -70,7 +70,7 @@ Linux Static Builds https://johnvansickle.com/ffmpeg/";>32-bit and -64-bit for kernel 2.6.32 and above +64-bit for kernel 3.2.0 and above --- Summary of changes: src/download | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- ___ 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] [ffmpeg-web] branch master updated. 48d8719 web/download: fix 4.2.2 to 4.2 typo
The branch, master has been updated via 48d8719ec0ee682fba3488bb7438a1f5d70e867b (commit) from 467d5eef95053f919a5a6bfa98aa30e582c9922f (commit) - Log - commit 48d8719ec0ee682fba3488bb7438a1f5d70e867b Author: Lou Logan AuthorDate: Thu Mar 19 11:01:04 2020 -0800 Commit: Lou Logan CommitDate: Thu Mar 19 11:01:04 2020 -0800 web/download: fix 4.2.2 to 4.2 typo Signed-off-by: Lou Logan diff --git a/src/download b/src/download index d9155ee..fad5b04 100644 --- a/src/download +++ b/src/download @@ -269,7 +269,7 @@ 4.2.2 was released on 2019-12-31. It is the latest stable FFmpeg release -from the 4.2.2 release branch, which was cut from master on 2019-07-21. +from the 4.2 release branch, which was cut from master on 2019-07-21. It includes the following library versions: --- Summary of changes: src/download | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- ___ 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/general: Fix entry for AMQP
ffmpeg | branch: master | Andriy Gelman | Thu Mar 19 07:57:31 2020 -0400| [140ce8ada6096e745bf58c2d2ee4c6277e955851] | committer: Marton Balint doc/general: Fix entry for AMQP Signed-off-by: Andriy Gelman Signed-off-by: Marton Balint > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=140ce8ada6096e745bf58c2d2ee4c6277e955851 --- doc/general.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/general.texi b/doc/general.texi index 14878f4dcf..752618a00b 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1336,7 +1336,7 @@ performance on systems without hardware floating point support). @multitable @columnfractions .4 .1 @item Name @tab Support -@item AMQP @tab X +@item AMQP @tab E @item file @tab X @item FTP @tab X @item Gopher @tab X ___ 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] fftools/ffmpeg_opt: Fix [u]int64_t specifier string
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Mar 18 03:56:18 2020 +0100| [d9f38b99dda8a7664f697d103ed15d8851beebf0] |
committer: Marton Balint
fftools/ffmpeg_opt: Fix [u]int64_t specifier string
PRId64 and PRIu64 already expand to the complete specifier; adding
another 'd' at the end is wrong and just leads to warnings that say
that only an option like '-frames:v 2d' will be used, although said
option won't be accepted at all ('Expected int64 for frames:v but found
2d').
Signed-off-by: Andreas Rheinhardt
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9f38b99dda8a7664f697d103ed15d8851beebf0
---
fftools/ffmpeg_opt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index b1b322c6ef..95001a963f 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -46,8 +46,8 @@
#define SPECIFIER_OPT_FMT_str "%s"
#define SPECIFIER_OPT_FMT_i"%i"
-#define SPECIFIER_OPT_FMT_i64 "%"PRId64"d"
-#define SPECIFIER_OPT_FMT_ui64 "%"PRIu64"d"
+#define SPECIFIER_OPT_FMT_i64 "%"PRId64
+#define SPECIFIER_OPT_FMT_ui64 "%"PRIu64
#define SPECIFIER_OPT_FMT_f"%f"
#define SPECIFIER_OPT_FMT_dbl "%lf"
___
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".
