virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

h2645_parse: add a function for uninitializing the packet

Browse Source
This commit is contained in:
Anton Khirnov 2016-03-21 07:33:25 +01:00
parent fa936a307f
commit 8229eff4b7
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h2645_parse.c
View File

@ -226,3 +226,12 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
return 0; return 0;
} }
void ff_h2645_packet_uninit(H2645Packet *pkt)
{
int i;
for (i = 0; i < pkt->nals_allocated; i++)
av_freep(&pkt->nals[i].rbsp_buffer);
av_freep(&pkt->nals);
pkt->nals_allocated = 0;
}

5
libavcodec/h2645_parse.h
View File

@ -61,4 +61,9 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length,
int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
AVCodecContext *avctx, int is_nalff, int nal_length_size); AVCodecContext *avctx, int is_nalff, int nal_length_size);
/**
* Free all the allocated memory in the packet.
*/
void ff_h2645_packet_uninit(H2645Packet *pkt);
#endif /* AVCODEC_H2645_PARSE_H */ #endif /* AVCODEC_H2645_PARSE_H */

5
libavcodec/hevc.c
View File

@ -2798,10 +2798,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx)
for (i = 0; i < FF_ARRAY_ELEMS(s->ps.pps_list); i++) for (i = 0; i < FF_ARRAY_ELEMS(s->ps.pps_list); i++)
av_buffer_unref(&s->ps.pps_list[i]); av_buffer_unref(&s->ps.pps_list[i]);
for (i = 0; i < s->pkt.nals_allocated; i++) ff_h2645_packet_uninit(&s->pkt);
av_freep(&s->pkt.nals[i].rbsp_buffer);
av_freep(&s->pkt.nals);
s->pkt.nals_allocated = 0;
return 0; return 0;
} }

5
libavcodec/hevc_parser.c
View File

@ -227,10 +227,7 @@ static void hevc_parser_close(AVCodecParserContext *s)
for (i = 0; i < FF_ARRAY_ELEMS(ctx->ps.pps_list); i++) for (i = 0; i < FF_ARRAY_ELEMS(ctx->ps.pps_list); i++)
av_buffer_unref(&ctx->ps.pps_list[i]); av_buffer_unref(&ctx->ps.pps_list[i]);
for (i = 0; i < ctx->pkt.nals_allocated; i++) ff_h2645_packet_uninit(&ctx->pkt);
av_freep(&ctx->pkt.nals[i].rbsp_buffer);
av_freep(&ctx->pkt.nals);
ctx->pkt.nals_allocated = 0;
av_freep(&ctx->pc.buffer); av_freep(&ctx->pc.buffer);
} }