RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'

Browse Source 
* commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a':
  libavformat: Use ffio_free_dyn_buf where applicable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-25 00:48:46 +01:00
commit 7f03f75ce7
8 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/dashenc.c
View File

@ -155,8 +155,7 @@ static void set_codec_str(AVFormatContext *s, AVCodecContext *codec,
if (avio_open_dyn_buf(&pb) < 0)
return;
if (ff_isom_write_avcc(pb, extradata, extradata_size) < 0) {
avio_close_dyn_buf(pb, &tmpbuf);
av_free(tmpbuf);
ffio_free_dyn_buf(&pb);
return;
}
extradata_size = avio_close_dyn_buf(pb, &extradata);

8
libavformat/id3v2.c
View File

@ -265,8 +265,8 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,
case ID3v2_ENCODING_UTF16BOM:
if ((left -= 2) < 0) {
av_log(s, AV_LOG_ERROR, "Cannot read BOM value, input too short\n");
avio_close_dyn_buf(dynbuf, dst);
av_freep(dst);
ffio_free_dyn_buf(&dynbuf);
*dst = NULL;
return AVERROR_INVALIDDATA;
}
switch (avio_rb16(pb)) {
@ -276,8 +276,8 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,
break;
default:
av_log(s, AV_LOG_ERROR, "Incorrect BOM value\n");
avio_close_dyn_buf(dynbuf, dst);
av_freep(dst);
ffio_free_dyn_buf(&dynbuf);
*dst = NULL;
*maxread = left;
return AVERROR_INVALIDDATA;
}

4
libavformat/movenchint.c
View File

@ -459,7 +459,6 @@ done:
void ff_mov_close_hinting(MOVTrack *track)
{
AVFormatContext *rtp_ctx = track->rtp_ctx;
uint8_t *ptr;
av_freep(&track->enc);
sample_queue_free(&track->sample_queue);
@ -467,8 +466,7 @@ void ff_mov_close_hinting(MOVTrack *track)
return;
if (rtp_ctx->pb) {
av_write_trailer(rtp_ctx);
avio_close_dyn_buf(rtp_ctx->pb, &ptr);
av_free(ptr);
ffio_free_dyn_buf(&rtp_ctx->pb);
}
avformat_free_context(rtp_ctx);
}

5
libavformat/mpegtsenc.c
View File

@ -30,6 +30,7 @@
#include "libavcodec/internal.h"
#include "avformat.h"
#include "avio_internal.h"
#include "internal.h"
#include "mpegts.h"
@ -1327,9 +1328,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
ret = av_write_frame(ts_st->amux, &pkt2);
if (ret < 0) {
avio_close_dyn_buf(ts_st->amux->pb, &data);
ts_st->amux->pb = NULL;
av_free(data);
ffio_free_dyn_buf(&ts_st->amux->pb);
return ret;
}
size = avio_close_dyn_buf(ts_st->amux->pb, &data);

11
libavformat/nutenc.c
View File

@ -666,11 +666,8 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc)
return ret;
if (ret > 0)
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
else {
uint8_t *buf;
avio_close_dyn_buf(dyn_bc, &buf);
av_free(buf);
}
else
ffio_free_dyn_buf(&dyn_bc);
}
for (i = 0; i < nut->avf->nb_chapters; i++) {
@ -679,9 +676,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc)
return ret;
ret = write_chapter(nut, dyn_bc, i);
if (ret < 0) {
uint8_t *buf;
avio_close_dyn_buf(dyn_bc, &buf);
av_freep(&buf);
ffio_free_dyn_buf(&dyn_bc);
return ret;
}
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);

4
libavformat/rtpenc_chain.c
View File

@ -91,9 +91,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
if (handle && rtpctx->pb) {
avio_closep(&rtpctx->pb);
} else if (rtpctx->pb) {
uint8_t *ptr;
avio_close_dyn_buf(rtpctx->pb, &ptr);
av_free(ptr);
ffio_free_dyn_buf(&rtpctx->pb);
}
avformat_free_context(rtpctx);
return ret;

13
libavformat/rtpenc_mpegts.c
View File

@ -21,6 +21,7 @@
#include "libavutil/mathematics.h"
#include "avformat.h"
#include "avio_internal.h"
struct MuxChain {
AVFormatContext *mpegts_ctx;
@ -33,11 +34,7 @@ static int rtp_mpegts_write_close(AVFormatContext *s)
if (chain->mpegts_ctx) {
av_write_trailer(chain->mpegts_ctx);
if (chain->mpegts_ctx->pb) {
uint8_t *buf;
avio_close_dyn_buf(chain->mpegts_ctx->pb, &buf);
av_free(buf);
}
ffio_free_dyn_buf(&chain->mpegts_ctx->pb);
avformat_free_context(chain->mpegts_ctx);
}
if (chain->rtp_ctx) {
@ -101,11 +98,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
fail:
if (mpegts_ctx) {
if (mpegts_ctx->pb) {
uint8_t *buf;
avio_close_dyn_buf(mpegts_ctx->pb, &buf);
av_free(buf);
}
ffio_free_dyn_buf(&chain->mpegts_ctx->pb);
avformat_free_context(mpegts_ctx);
}
if (rtp_ctx)

4
libavformat/rtsp.c
View File

@ -710,11 +710,9 @@ void ff_rtsp_undo_setup(AVFormatContext *s, int send_packets)
AVFormatContext *rtpctx = rtsp_st->transport_priv;
av_write_trailer(rtpctx);
if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
uint8_t *ptr;
if (CONFIG_RTSP_MUXER && rtpctx->pb && send_packets)
ff_rtsp_tcp_write_packet(s, rtsp_st);
avio_close_dyn_buf(rtpctx->pb, &ptr);
av_free(ptr);
ffio_free_dyn_buf(&rtpctx->pb);
} else {
avio_closep(&rtpctx->pb);
}