virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-12 00:13:21 +02:00
parent a5ef7960fc
commit 98fd8a7848
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/avpacket.c
View File

@ -29,15 +29,6 @@
#include "bytestream.h" #include "bytestream.h"
#include "internal.h" #include "internal.h"
void ff_packet_free_side_data(AVPacket *pkt)
{
int i;
for (i = 0; i < pkt->side_data_elems; i++)
av_free(pkt->side_data[i].data);
av_freep(&pkt->side_data);
pkt->side_data_elems = 0;
}
#if FF_API_DESTRUCT_PACKET #if FF_API_DESTRUCT_PACKET
void av_destruct_packet(AVPacket *pkt) void av_destruct_packet(AVPacket *pkt)

5
libavcodec/internal.h
View File

@ -140,11 +140,6 @@ int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame);
void avpriv_color_frame(AVFrame *frame, const int color[4]); void avpriv_color_frame(AVFrame *frame, const int color[4]);
/**
* Remove and free all side data from packet.
*/
void ff_packet_free_side_data(AVPacket *pkt);
extern volatile int ff_avcodec_locked; extern volatile int ff_avcodec_locked;
int ff_lock_avcodec(AVCodecContext *log_ctx); int ff_lock_avcodec(AVCodecContext *log_ctx);
int ff_unlock_avcodec(void); int ff_unlock_avcodec(void);

8
libavcodec/utils.c
View File

@ -1712,7 +1712,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY); avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
} }
/* free any side data since we cannot return it */ /* free any side data since we cannot return it */
ff_packet_free_side_data(&pkt); av_packet_free_side_data(&pkt);
if (frame && frame->extended_data != frame->data) if (frame && frame->extended_data != frame->data)
av_freep(&frame->extended_data); av_freep(&frame->extended_data);
@ -2001,7 +2001,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
avctx->pkt = NULL; avctx->pkt = NULL;
if (did_split) { if (did_split) {
ff_packet_free_side_data(&tmp); av_packet_free_side_data(&tmp);
if(ret == tmp.size) if(ret == tmp.size)
ret = avpkt->size; ret = avpkt->size;
} }
@ -2177,7 +2177,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
avctx->pkt = NULL; avctx->pkt = NULL;
if (did_split) { if (did_split) {
ff_packet_free_side_data(&tmp); av_packet_free_side_data(&tmp);
if(ret == tmp.size) if(ret == tmp.size)
ret = avpkt->size; ret = avpkt->size;
} }
@ -2352,7 +2352,7 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
} }
if (did_split) { if (did_split) {
ff_packet_free_side_data(&tmp); av_packet_free_side_data(&tmp);
if(ret == tmp.size) if(ret == tmp.size)
ret = avpkt->size; ret = avpkt->size;
} }