lavd/decklink_dec: Do not claim to output transparency information.

Carl Eugen Hoyos committed 9 years ago

Commit f49c1291 parent 41569bb2 files · +3 −3Browse files

Unified · Split

2 files

libavdevice/decklink_dec.cpp +2 −2
libavdevice/version.h +1 −1

libavdevice/decklink_dec.cpp+2−2

@@ -965,13 +965,13 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) · 964 unmodified lines
965	case bmdFormat8BitARGB:	965	case bmdFormat8BitARGB:
966	st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;	966	st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
967	st->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag((enum AVPixelFormat)st->codecpar->format);;	967	st->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag((enum AVPixelFormat)st->codecpar->format);;
968	st->codecpar->format = AV_PIX_FMT_ARGB;	968	st->codecpar->format = AV_PIX_FMT_0RGB;
969	st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 32, st->time_base.den, st->time_base.num);	969	st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 32, st->time_base.den, st->time_base.num);
970	break;	970	break;
971	case bmdFormat8BitBGRA:	971	case bmdFormat8BitBGRA:
972	st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;	972	st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
973	st->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag((enum AVPixelFormat)st->codecpar->format);	973	st->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag((enum AVPixelFormat)st->codecpar->format);
974	st->codecpar->format = AV_PIX_FMT_BGRA;	974	st->codecpar->format = AV_PIX_FMT_BGR0;
975	st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 32, st->time_base.den, st->time_base.num);	975	st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 32, st->time_base.den, st->time_base.num);
976	break;	976	break;
977	case bmdFormat10BitRGB:	977	case bmdFormat10BitRGB:

libavdevice/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29		29
30	#define LIBAVDEVICE_VERSION_MAJOR 57	30	#define LIBAVDEVICE_VERSION_MAJOR 57
31	#define LIBAVDEVICE_VERSION_MINOR 9	31	#define LIBAVDEVICE_VERSION_MINOR 9
32	#define LIBAVDEVICE_VERSION_MICRO 101	32	#define LIBAVDEVICE_VERSION_MICRO 102
33		33
34	#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \	34	#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
35	LIBAVDEVICE_VERSION_MINOR, \	35	LIBAVDEVICE_VERSION_MINOR, \