Commit 2fc9a3eb authored by Jan Sebechlebsky's avatar Jan Sebechlebsky Committed by Michael Niedermayer

avformat/mux: Restore original ts in write_packet on error

Restore original timestamps in write_packet() if the
actual write operation was not successfull. This allows
to pass the same packet to nonblocking muxer repeatedly
without corrupting the timestamps.
Signed-off-by: 's avatarJan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 429b41e7
...@@ -657,6 +657,10 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -657,6 +657,10 @@ 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, did_split;
int64_t pts_backup, dts_backup;
pts_backup = pkt->pts;
dts_backup = pkt->dts;
if (s->output_ts_offset) { if (s->output_ts_offset) {
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
...@@ -743,6 +747,11 @@ fail: ...@@ -743,6 +747,11 @@ fail:
if (did_split) if (did_split)
av_packet_merge_side_data(pkt); av_packet_merge_side_data(pkt);
if (ret < 0) {
pkt->pts = pts_backup;
pkt->dts = dts_backup;
}
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment