early-access version 1680
This commit is contained in:
6
externals/ffmpeg/libavformat/matroskaenc.c
vendored
6
externals/ffmpeg/libavformat/matroskaenc.c
vendored
@@ -2007,7 +2007,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
|
||||
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
|
||||
mkv_track *track = &mkv->tracks[pkt->stream_index];
|
||||
uint8_t *data = NULL, *side_data = NULL;
|
||||
int err = 0, offset = 0, size = pkt->size, side_data_size = 0;
|
||||
int err = 0, offset = 0, size = pkt->size, side_data_size;
|
||||
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
|
||||
uint64_t additional_id;
|
||||
int64_t discard_padding = 0;
|
||||
@@ -2122,12 +2122,10 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPac
|
||||
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
|
||||
const int flags = 0;
|
||||
|
||||
id_size = 0;
|
||||
id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER,
|
||||
&id_size);
|
||||
id = id ? id : "";
|
||||
|
||||
settings_size = 0;
|
||||
settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS,
|
||||
&settings_size);
|
||||
settings = settings ? settings : "";
|
||||
@@ -2184,7 +2182,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt)
|
||||
mkv_track *track = &mkv->tracks[pkt->stream_index];
|
||||
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
|
||||
uint8_t *side_data;
|
||||
int side_data_size = 0, ret;
|
||||
int side_data_size, ret;
|
||||
|
||||
side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
|
||||
&side_data_size);
|
||||
|
Reference in New Issue
Block a user