summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-08 22:58:33 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-08 22:58:33 +0200
commitf49c129dd494378b16f3f782f59f07bbabfab258 (patch)
treeeb3936ea2cb0f99427f2a79d2d20bfa674987a15 /libavdevice
parent41569bbc66d8971a1c5d369e5b335b3542f9cd26 (diff)
downloadffmpeg-f49c129dd494378b16f3f782f59f07bbabfab258.tar.gz
lavd/decklink_dec: Do not claim to output transparency information.
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/decklink_dec.cpp4
-rw-r--r--libavdevice/version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index 7ac04375d9..6f796e4941 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -965,13 +965,13 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
case bmdFormat8BitARGB:
st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
st->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag((enum AVPixelFormat)st->codecpar->format);;
- st->codecpar->format = AV_PIX_FMT_ARGB;
+ st->codecpar->format = AV_PIX_FMT_0RGB;
st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 32, st->time_base.den, st->time_base.num);
break;
case bmdFormat8BitBGRA:
st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
st->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag((enum AVPixelFormat)st->codecpar->format);
- st->codecpar->format = AV_PIX_FMT_BGRA;
+ st->codecpar->format = AV_PIX_FMT_BGR0;
st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 32, st->time_base.den, st->time_base.num);
break;
case bmdFormat10BitRGB:
diff --git a/libavdevice/version.h b/libavdevice/version.h
index 3fbd273fc3..14b8e2acae 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -29,7 +29,7 @@
#define LIBAVDEVICE_VERSION_MAJOR 57
#define LIBAVDEVICE_VERSION_MINOR 9
-#define LIBAVDEVICE_VERSION_MICRO 101
+#define LIBAVDEVICE_VERSION_MICRO 102
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \