aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2017-02-17 00:46:14 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2017-02-17 10:44:45 +0100
commit92d8106fa6108a5e7dd3080f6b094636d5aedfc0 (patch)
treec7331f99c3f40e85731ff4b9a64e8d7a259a3b9f
parent523da8eac176c241881a9177237f8bf60e8d7b75 (diff)
downloadffmpeg-92d8106fa6108a5e7dd3080f6b094636d5aedfc0.tar.gz
lavc/avpacket: Initialize a variable in error path.
Fixes ticket #6153. Tested-by: Tyson Smith (cherry picked from commit 1d54be215309b8aa71a51826e4b0a1660fef9f93)
-rw-r--r--libavcodec/avpacket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index bf168bed49..39e6e9762c 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -337,6 +337,8 @@ uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
return pkt->side_data[i].data;
}
}
+ if (size)
+ *size = 0;
return NULL;
}