Message ID | 1605924448-26279-4-git-send-email-lance.lmwang@gmail.com |
---|---|
State | Accepted |
Commit | 01eb05207cbbe44e4c58a15894d49ff81a465a37 |
Headers | show |
Series | [FFmpeg-devel,1/4] avdevice/decklink: use boolean for list_devices option | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
On Sat, 21 Nov 2020, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavdevice/decklink_dec.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp > index 049e133..2e41b58 100644 > --- a/libavdevice/decklink_dec.cpp > +++ b/libavdevice/decklink_dec.cpp > @@ -945,13 +945,13 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( > > if (videoFrame->GetAncillaryData(&vanc) == S_OK) { > int i; > - int64_t line_mask = 1; > BMDPixelFormat vanc_format = vanc->GetPixelFormat(); > txt_buf[0] = 0x10; // data_identifier - EBU_data > txt_buf++; > #if CONFIG_LIBZVBI > if (ctx->bmd_mode == bmdModePAL && ctx->teletext_lines && > (vanc_format == bmdFormat8BitYUV || vanc_format == bmdFormat10BitYUV)) { > + int64_t line_mask = 1; > av_assert0(videoFrame->GetWidth() == 720); > for (i = 6; i < 336; i++, line_mask <<= 1) { > uint8_t *buf; LGTM, thanks. Marton
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 049e133..2e41b58 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -945,13 +945,13 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( if (videoFrame->GetAncillaryData(&vanc) == S_OK) { int i; - int64_t line_mask = 1; BMDPixelFormat vanc_format = vanc->GetPixelFormat(); txt_buf[0] = 0x10; // data_identifier - EBU_data txt_buf++; #if CONFIG_LIBZVBI if (ctx->bmd_mode == bmdModePAL && ctx->teletext_lines && (vanc_format == bmdFormat8BitYUV || vanc_format == bmdFormat10BitYUV)) { + int64_t line_mask = 1; av_assert0(videoFrame->GetWidth() == 720); for (i = 6; i < 336; i++, line_mask <<= 1) { uint8_t *buf;