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:32 +0100
commit401a3ae2cb33309d3bc8e9bb8e6b5861deb90d93 (patch)
tree16c75ba9d76f98fc28cf5c1966c3ef15f1ad5e51
parent384d90f26800521440a1d64d7c6967e9b552a690 (diff)
downloadffmpeg-401a3ae2cb33309d3bc8e9bb8e6b5861deb90d93.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 443a19ad1d..e8b2959541 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -348,6 +348,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;
}