---
libavformat/movenc.c | 63 ++++++++++++++++++++++------------------------------
1 file changed, 27 insertions(+), 36 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index efaac36..3146799 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5233,21 +5233,18 @@ static int mov_write_header(AVFormatContext *s)
if (mov->encryption_key_len != AES_CTR_KEY_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid encryption key len %d
expected %d\n",
mov->encryption_key_len, AES_CTR_KEY_SIZE);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
if (mov->encryption_kid_len != CENC_KID_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid encryption kid len %d
expected %d\n",
mov->encryption_kid_len, CENC_KID_SIZE);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
} else {
av_log(s, AV_LOG_ERROR, "unsupported encryption scheme %s\n",
mov->encryption_scheme_str);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
}
@@ -5267,8 +5264,7 @@ static int mov_write_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "Could not find tag for codec %s in stream
#%d, "
"codec not currently supported in container\n",
avcodec_get_name(st->codec->codec_id), i);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
/* If hinting of this track is enabled by a later hint track,
* this is updated. */
@@ -5282,8 +5278,7 @@ static int mov_write_header(AVFormatContext *s)
track->tag == MKTAG('m','x','5','p') || track->tag ==
MKTAG('m','x','5','n')) {
if (st->codec->width != 720 || (st->codec->height != 608 &&
st->codec->height != 512)) {
av_log(s, AV_LOG_ERROR, "D-10/IMX must use 720x608 or
720x512 video resolution\n");
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
track->height = track->tag >> 24 == 'n' ? 486 : 576;
}
@@ -5296,8 +5291,7 @@ static int mov_write_header(AVFormatContext *s)
}
if (st->codec->width > 65535 || st->codec->height > 65535) {
av_log(s, AV_LOG_ERROR, "Resolution %dx%d too large for
mov/mp4\n", st->codec->width, st->codec->height);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
if (track->mode == MODE_MOV && track->timescale > 100000)
av_log(s, AV_LOG_WARNING,
@@ -5328,8 +5322,7 @@ static int mov_write_header(AVFormatContext *s)
st->codec->codec_id == AV_CODEC_ID_ILBC){
if (!st->codec->block_align) {
av_log(s, AV_LOG_ERROR, "track %d: codec block align is
not set for adpcm\n", i);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
track->sample_size = st->codec->block_align;
}else if (st->codec->frame_size > 1){ /* assume compressed audio */
@@ -5346,8 +5339,7 @@ static int mov_write_header(AVFormatContext *s)
if (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL) {
av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is
not standard, to mux anyway set strict to -1\n",
i, track->enc->sample_rate);
- ret = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
} else {
av_log(s, AV_LOG_WARNING, "track %d: muxing mp3 at %dhz is
not standard in MP4\n",
i, track->enc->sample_rate);
@@ -5377,8 +5369,7 @@ static int mov_write_header(AVFormatContext *s)
track->vos_len = st->codec->extradata_size;
track->vos_data = av_malloc(track->vos_len);
if (!track->vos_data) {
- ret = AVERROR(ENOMEM);
- goto error;
+ return AVERROR(ENOMEM);
}
memcpy(track->vos_data, st->codec->extradata, track->vos_len);
}
@@ -5387,9 +5378,8 @@ static int mov_write_header(AVFormatContext *s)
if (mov->encryption_scheme == MOV_ENC_CENC_AES_CTR) {
ret = ff_mov_cenc_init(&track->cenc, mov->encryption_key,
track->enc->codec_id == AV_CODEC_ID_H264, s->flags &
AVFMT_FLAG_BITEXACT);
- if (ret) {
- goto error;
- }
+ if (ret)
+ return ret;
}
}
@@ -5445,7 +5435,7 @@ static int mov_write_header(AVFormatContext *s)
if (mov->chapter_track)
if ((ret = mov_create_chapter_track(s, mov->chapter_track)) < 0)
- goto error;
+ return ret;
if (mov->flags & FF_MOV_FLAG_RTP_HINT) {
/* Initialize the hint tracks for each audio and video stream */
@@ -5454,7 +5444,7 @@ static int mov_write_header(AVFormatContext *s)
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if ((ret = ff_mov_init_hinting(s, hint_track, i)) < 0)
- goto error;
+ return ret;
hint_track++;
}
}
@@ -5472,7 +5462,7 @@ static int mov_write_header(AVFormatContext *s)
if (!t)
continue;
if ((ret = mov_create_timecode_track(s, tmcd_track, i,
t->value)) < 0)
- goto error;
+ return ret;
tmcd_track++;
}
}
@@ -5494,9 +5484,6 @@ static int mov_write_header(AVFormatContext *s)
}
return 0;
- error:
- mov_free(s);
- return ret;
}
static int get_moov_size(AVFormatContext *s)
@@ -5664,7 +5651,7 @@ static int mov_write_trailer(AVFormatContext *s)
if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters) {
mov->chapter_track = mov->nb_streams++;
if ((res = mov_create_chapter_track(s, mov->chapter_track)) < 0)
- goto error;
+ return res;
}
}
@@ -5692,17 +5679,16 @@ static int mov_write_trailer(AVFormatContext *s)
if (res == 0) {
avio_seek(pb, mov->reserved_header_pos, SEEK_SET);
if ((res = mov_write_moov_tag(pb, mov, s)) < 0)
- goto error;
+ return res;
}
} else if (mov->reserved_moov_size > 0) {
int64_t size;
if ((res = mov_write_moov_tag(pb, mov, s)) < 0)
- goto error;
+ return res;
size = mov->reserved_moov_size - (avio_tell(pb) -
mov->reserved_header_pos);
if (size < 8){
av_log(s, AV_LOG_ERROR, "reserved_moov_size is too small,
needed %"PRId64" additional\n", 8-size);
- res = AVERROR(EINVAL);
- goto error;
+ return AVERROR(EINVAL);
}
avio_wb32(pb, size);
ffio_wfourcc(pb, "free");
@@ -5710,7 +5696,7 @@ static int mov_write_trailer(AVFormatContext *s)
avio_seek(pb, moov_pos, SEEK_SET);
} else {
if ((res = mov_write_moov_tag(pb, mov, s)) < 0)
- goto error;
+ return res;
}
res = 0;
} else {
@@ -5732,9 +5718,6 @@ static int mov_write_trailer(AVFormatContext *s)
}
}
-error:
- mov_free(s);
-
return res;
}
@@ -5751,6 +5734,7 @@ AVOutputFormat ff_mov_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){
ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0
@@ -5770,6 +5754,7 @@ AVOutputFormat ff_tgp_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
.priv_class = &tgp_muxer_class,
@@ -5789,6 +5774,7 @@ AVOutputFormat ff_mp4_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &mp4_muxer_class,
@@ -5807,6 +5793,7 @@ AVOutputFormat ff_psp_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &psp_muxer_class,
@@ -5824,6 +5811,7 @@ AVOutputFormat ff_tg2_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
.priv_class = &tg2_muxer_class,
@@ -5842,6 +5830,7 @@ AVOutputFormat ff_ipod_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 },
.priv_class = &ipod_muxer_class,
@@ -5860,6 +5849,7 @@ AVOutputFormat ff_ismv_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH |
AVFMT_TS_NEGATIVE,
.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &ismv_muxer_class,
@@ -5878,6 +5868,7 @@ AVOutputFormat ff_f4v_muxer = {
.write_header = mov_write_header,
.write_packet = mov_write_packet,
.write_trailer = mov_write_trailer,
+ .deinit = mov_free,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ codec_f4v_tags, 0 },
.priv_class = &f4v_muxer_class,
--
2.7.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
