Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'

* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
  avpacket: Replace av_free_packet with av_packet_unref

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-10-27 14:28:56 +01:00
73 changed files with 154 additions and 138 deletions

View File

@@ -267,7 +267,7 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt)
return pkt->size;
error_eof:
av_free_packet(pkt);
av_packet_unref(pkt);
return ret < 0 ? ret : AVERROR_EOF;
}
@@ -309,7 +309,7 @@ static int dss_723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = avio_read(s->pb, pkt->data + offset,
size2 - offset);
if (ret < size2 - offset) {
av_free_packet(pkt);
av_packet_unref(pkt);
return ret < 0 ? ret : AVERROR_EOF;
}
@@ -319,7 +319,7 @@ static int dss_723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = avio_read(s->pb, pkt->data + offset, size - offset);
if (ret < size - offset) {
av_free_packet(pkt);
av_packet_unref(pkt);
return ret < 0 ? ret : AVERROR_EOF;
}