History

avcodec/decode: Reindentation

Andreas Rheinhardt committed 5 years ago

Commit 03641881 parent cc448f81 file · +24 −25Browse files

Unified · Split

libavcodec/decode.c+24−25
@@ -1723,7 +1723,6 @@ static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) · 1722 unmodified lines
1723int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)1723int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
1724{1724{
1725 AVPacket *pkt = avctx->internal->last_pkt_props;1725 AVPacket *pkt = avctx->internal->last_pkt_props;
1726 int i;
1727 static const struct {1726 static const struct {
1728 enum AVPacketSideDataType packet;1727 enum AVPacketSideDataType packet;
1729 enum AVFrameSideDataType frame;1728 enum AVFrameSideDataType frame;
@@ -1744,36 +1743,36 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) · 14 unmodified lines
1744 av_fifo_generic_read(avctx->internal->pkt_props,1743 av_fifo_generic_read(avctx->internal->pkt_props,
1745 pkt, sizeof(*pkt), NULL);1744 pkt, sizeof(*pkt), NULL);
1746 1745
1747 frame->pts = pkt->pts;1746 frame->pts = pkt->pts;
1748#if FF_API_PKT_PTS1747#if FF_API_PKT_PTS
1749FF_DISABLE_DEPRECATION_WARNINGS1748FF_DISABLE_DEPRECATION_WARNINGS
1750 frame->pkt_pts = pkt->pts;1749 frame->pkt_pts = pkt->pts;
1751FF_ENABLE_DEPRECATION_WARNINGS1750FF_ENABLE_DEPRECATION_WARNINGS
1752#endif1751#endif
1753 frame->pkt_pos = pkt->pos;1752 frame->pkt_pos = pkt->pos;
1754 frame->pkt_duration = pkt->duration;1753 frame->pkt_duration = pkt->duration;
1755 frame->pkt_size = pkt->size;1754 frame->pkt_size = pkt->size;
1756 1755
1757 for (i = 0; i < FF_ARRAY_ELEMS(sd); i++) {1756 for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
1758 buffer_size_t size;1757 buffer_size_t size;
1759 uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);1758 uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
1760 if (packet_sd) {1759 if (packet_sd) {
1761 AVFrameSideData *frame_sd = av_frame_new_side_data(frame,1760 AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
1762 sd[i].frame,1761 sd[i].frame,
1763 size);1762 size);
1764 if (!frame_sd)1763 if (!frame_sd)
1765 return AVERROR(ENOMEM);1764 return AVERROR(ENOMEM);
1766 1765
1767 memcpy(frame_sd->data, packet_sd, size);1766 memcpy(frame_sd->data, packet_sd, size);
1768 }
1769 }1767 }
1770 add_metadata_from_side_data(pkt, frame);1768 }
1769 add_metadata_from_side_data(pkt, frame);
1771 1770
1772 if (pkt->flags & AV_PKT_FLAG_DISCARD) {1771 if (pkt->flags & AV_PKT_FLAG_DISCARD) {
1773 frame->flags |= AV_FRAME_FLAG_DISCARD;1772 frame->flags |= AV_FRAME_FLAG_DISCARD;
1774 } else {1773 } else {
1775 frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);1774 frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
1776 }1775 }
1777 frame->reordered_opaque = avctx->reordered_opaque;1776 frame->reordered_opaque = avctx->reordered_opaque;
1778 1777
1779 if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED)1778 if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t