| Message ID | 20171110214059.84891-14-ffmpeg@tmm1.net |
|---|---|
| State | Accepted |
| Commit | 5e577c586b7825b4addd1d38cf20688d7d50010d |
| Headers | show |
Patchset LGTM. > On Nov 10, 2017, at 15:40, Aman Gupta <ffmpeg@tmm1.net> wrote: > > From: Aman Gupta <aman@tmm1.net> > > --- > libavcodec/videotoolbox.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c > index 9eb06e619f..04c558935d 100644 > --- a/libavcodec/videotoolbox.c > +++ b/libavcodec/videotoolbox.c > @@ -88,7 +88,7 @@ int ff_videotoolbox_alloc_frame(AVCodecContext *avctx, AVFrame *frame) > > CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) > { > - H264Context *h = avctx->priv_data; > + H264Context *h = avctx->priv_data; > CFDataRef data = NULL; > uint8_t *p; > int vt_extradata_size = 6 + 2 + h->ps.sps->data_size + 3 + h->ps.pps->data_size; > @@ -897,7 +897,7 @@ static int videotoolbox_start(AVCodecContext *avctx) > case kVTVideoDecoderMalfunctionErr: > av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox malfunction.\n"); > return AVERROR(EINVAL); > - case kVTVideoDecoderBadDataErr : > + case kVTVideoDecoderBadDataErr: > av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox reported invalid data.\n"); > return AVERROR_INVALIDDATA; > case 0: > -- > 2.14.2 >
On Fri, Nov 10, 2017 at 1:50 PM, Rodger Combs <rodger.combs@gmail.com> wrote: > Patchset LGTM. > Patchset applied. Thanks for the review. > > > On Nov 10, 2017, at 15:40, Aman Gupta <ffmpeg@tmm1.net> wrote: > > > > From: Aman Gupta <aman@tmm1.net> > > > > --- > > libavcodec/videotoolbox.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c > > index 9eb06e619f..04c558935d 100644 > > --- a/libavcodec/videotoolbox.c > > +++ b/libavcodec/videotoolbox.c > > @@ -88,7 +88,7 @@ int ff_videotoolbox_alloc_frame(AVCodecContext > *avctx, AVFrame *frame) > > > > CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) > > { > > - H264Context *h = avctx->priv_data; > > + H264Context *h = avctx->priv_data; > > CFDataRef data = NULL; > > uint8_t *p; > > int vt_extradata_size = 6 + 2 + h->ps.sps->data_size + 3 + > h->ps.pps->data_size; > > @@ -897,7 +897,7 @@ static int videotoolbox_start(AVCodecContext *avctx) > > case kVTVideoDecoderMalfunctionErr: > > av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox malfunction.\n"); > > return AVERROR(EINVAL); > > - case kVTVideoDecoderBadDataErr : > > + case kVTVideoDecoderBadDataErr: > > av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox reported invalid > data.\n"); > > return AVERROR_INVALIDDATA; > > case 0: > > -- > > 2.14.2 > > > >
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 9eb06e619f..04c558935d 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -88,7 +88,7 @@ int ff_videotoolbox_alloc_frame(AVCodecContext *avctx, AVFrame *frame) CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) { - H264Context *h = avctx->priv_data; + H264Context *h = avctx->priv_data; CFDataRef data = NULL; uint8_t *p; int vt_extradata_size = 6 + 2 + h->ps.sps->data_size + 3 + h->ps.pps->data_size; @@ -897,7 +897,7 @@ static int videotoolbox_start(AVCodecContext *avctx) case kVTVideoDecoderMalfunctionErr: av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox malfunction.\n"); return AVERROR(EINVAL); - case kVTVideoDecoderBadDataErr : + case kVTVideoDecoderBadDataErr: av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox reported invalid data.\n"); return AVERROR_INVALIDDATA; case 0:
From: Aman Gupta <aman@tmm1.net> --- libavcodec/videotoolbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)