repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
avpacket.c
diff --git
a/ffmpeg/libavcodec/avpacket.c
b/ffmpeg/libavcodec/avpacket.c
index a87e8e3eade035f28ed051514188c58919820e4e..3c26046dad1ec862f1b07afa070f2c1c255d55b4 100644
(file)
--- a/
ffmpeg/libavcodec/avpacket.c
+++ b/
ffmpeg/libavcodec/avpacket.c
@@
-34,8
+34,7
@@
void av_destruct_packet(AVPacket *pkt)
{
void av_destruct_packet(AVPacket *pkt)
{
- av_free(pkt->data);
- pkt->data = NULL;
+ av_freep(&pkt->data);
pkt->size = 0;
}
pkt->size = 0;
}
@@
-273,7
+272,7
@@
void av_packet_free_side_data(AVPacket *pkt)
{
int i;
for (i = 0; i < pkt->side_data_elems; i++)
{
int i;
for (i = 0; i < pkt->side_data_elems; i++)
- av_free
(
pkt->side_data[i].data);
+ av_free
p(&
pkt->side_data[i].data);
av_freep(&pkt->side_data);
pkt->side_data_elems = 0;
}
av_freep(&pkt->side_data);
pkt->side_data_elems = 0;
}