ffmpeg | branch: master | Carl Eugen Hoyos <ceffm...@gmail.com> | Sun Oct 8 22:58:33 2017 +0200| [f49c129dd494378b16f3f782f59f07bbabfab258] | committer: Carl Eugen Hoyos
lavd/decklink_dec: Do not claim to output transparency information. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f49c129dd494378b16f3f782f59f07bbabfab258 --- libavdevice/decklink_dec.cpp | 4 ++-- libavdevice/version.h | 2 +- 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, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
