har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mux: split side data earlier in av_write_frame and av_interleaved_write_frame

Browse Source 
Similarly, merge it back before returning.

Fixes ticket #5927.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-11-04 12:48:20 -03:00
parent db79dedb1a
commit fba2a8a254
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/mux.c
View File

@ -692,7 +692,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
*/ */
static int write_packet(AVFormatContext *s, AVPacket *pkt) static int write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret, did_split; int ret;
int64_t pts_backup, dts_backup; int64_t pts_backup, dts_backup;
pts_backup = pkt->pts; pts_backup = pkt->pts;
@ -755,8 +755,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
did_split = av_packet_split_side_data(pkt);
if (!s->internal->header_written) { if (!s->internal->header_written) {
ret = s->internal->write_header_ret ? s->internal->write_header_ret : write_header_internal(s); ret = s->internal->write_header_ret ? s->internal->write_header_ret : write_header_internal(s);
if (ret < 0) if (ret < 0)
@ -780,9 +778,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} }
fail: fail:
if (did_split)
av_packet_merge_side_data(pkt);
if (ret < 0) { if (ret < 0) {
pkt->pts = pts_backup; pkt->pts = pts_backup;
pkt->dts = dts_backup; pkt->dts = dts_backup;
@ -918,7 +913,7 @@ static int do_packet_auto_bsf(AVFormatContext *s, AVPacket *pkt) {
int av_write_frame(AVFormatContext *s, AVPacket *pkt) int av_write_frame(AVFormatContext *s, AVPacket *pkt)
{ {
int ret; int ret, did_split = 0;
ret = prepare_input_packet(s, pkt); ret = prepare_input_packet(s, pkt);
if (ret < 0) if (ret < 0)
@ -939,7 +934,8 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }
return 1; return 1;
} } else
did_split = av_packet_split_side_data(pkt);
ret = do_packet_auto_bsf(s, pkt); ret = do_packet_auto_bsf(s, pkt);
if (ret <= 0) if (ret <= 0)
@ -958,6 +954,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
if (ret >= 0) if (ret >= 0)
s->streams[pkt->stream_index]->nb_frames++; s->streams[pkt->stream_index]->nb_frames++;
if (did_split)
av_packet_merge_side_data(pkt);
return ret; return ret;
} }
@ -1224,7 +1224,7 @@ static int interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, in
int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
{ {
int ret, flush = 0; int ret, did_split = 0, flush = 0;
ret = prepare_input_packet(s, pkt); ret = prepare_input_packet(s, pkt);
if (ret < 0) if (ret < 0)
@ -1233,6 +1233,8 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
if (pkt) { if (pkt) {
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
did_split = av_packet_split_side_data(pkt);
ret = do_packet_auto_bsf(s, pkt); ret = do_packet_auto_bsf(s, pkt);
if (ret == 0) if (ret == 0)
return 0; return 0;
@ -1280,6 +1282,9 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
return s->pb->error; return s->pb->error;
} }
fail: fail:
if (did_split)
av_packet_merge_side_data(pkt);
av_packet_unref(pkt); av_packet_unref(pkt);
return ret; return ret;
} }