[FFmpeg-cvslog] avcodec/decode: reindent after the previous commit
James Almer
git at videolan.org
Wed Jun 23 21:14:34 EEST 2021
ffmpeg | branch: release/4.4 | James Almer <jamrial at gmail.com> | Mon Jun 21 15:05:11 2021 -0300| [4a953e5c818fb9170b372258011ae5034ac5c041] | committer: James Almer
avcodec/decode: reindent after the previous commit
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit b4c2ff3e4140b29ba94cc95164b26c3a394d1294)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a953e5c818fb9170b372258011ae5034ac5c041
---
libavcodec/decode.c | 58 ++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 1126b06882..936e5d63da 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -234,9 +234,9 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt)
return ret;
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
- ret = extract_packet_props(avctx->internal, pkt);
- if (ret < 0)
- goto finish;
+ ret = extract_packet_props(avctx->internal, pkt);
+ if (ret < 0)
+ goto finish;
}
ret = apply_param_change(avctx, pkt);
@@ -508,8 +508,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
pkt->dts = AV_NOPTS_VALUE;
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
avci->last_pkt_props->size -= consumed; // See extract_packet_props() comment.
- avci->last_pkt_props->pts = AV_NOPTS_VALUE;
- avci->last_pkt_props->dts = AV_NOPTS_VALUE;
+ avci->last_pkt_props->pts = AV_NOPTS_VALUE;
+ avci->last_pkt_props->dts = AV_NOPTS_VALUE;
}
}
@@ -1748,36 +1748,36 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
};
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
- frame->pts = pkt->pts;
+ frame->pts = pkt->pts;
#if FF_API_PKT_PTS
FF_DISABLE_DEPRECATION_WARNINGS
- frame->pkt_pts = pkt->pts;
+ frame->pkt_pts = pkt->pts;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
- frame->pkt_pos = pkt->pos;
- frame->pkt_duration = pkt->duration;
- frame->pkt_size = pkt->size;
-
- for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
- buffer_size_t size;
- uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
- if (packet_sd) {
- AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
- sd[i].frame,
- size);
- if (!frame_sd)
- return AVERROR(ENOMEM);
-
- memcpy(frame_sd->data, packet_sd, size);
+ frame->pkt_pos = pkt->pos;
+ frame->pkt_duration = pkt->duration;
+ frame->pkt_size = pkt->size;
+
+ for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
+ buffer_size_t size;
+ uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
+ if (packet_sd) {
+ AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
+ sd[i].frame,
+ size);
+ if (!frame_sd)
+ return AVERROR(ENOMEM);
+
+ memcpy(frame_sd->data, packet_sd, size);
+ }
}
- }
- add_metadata_from_side_data(pkt, frame);
+ add_metadata_from_side_data(pkt, frame);
- if (pkt->flags & AV_PKT_FLAG_DISCARD) {
- frame->flags |= AV_FRAME_FLAG_DISCARD;
- } else {
- frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
- }
+ if (pkt->flags & AV_PKT_FLAG_DISCARD) {
+ frame->flags |= AV_FRAME_FLAG_DISCARD;
+ } else {
+ frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
+ }
}
frame->reordered_opaque = avctx->reordered_opaque;
More information about the ffmpeg-cvslog
mailing list