mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9'
* commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9': Set protocol-level metadata in AVFormatContext any time a packet is read. Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
f01a1281ee
|
@ -1286,6 +1286,7 @@ static int read_from_packet_buffer(AVPacketList **pkt_buffer,
|
||||||
static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
|
static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
|
||||||
{
|
{
|
||||||
int ret = 0, i, got_packet = 0;
|
int ret = 0, i, got_packet = 0;
|
||||||
|
AVDictionary *metadata = NULL;
|
||||||
|
|
||||||
av_init_packet(pkt);
|
av_init_packet(pkt);
|
||||||
|
|
||||||
|
@ -1411,6 +1412,14 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
|
||||||
av_packet_merge_side_data(pkt);
|
av_packet_merge_side_data(pkt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
av_opt_get_dict_val(s, "metadata", AV_OPT_SEARCH_CHILDREN, &metadata);
|
||||||
|
if (metadata) {
|
||||||
|
s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
|
||||||
|
av_dict_copy(&s->metadata, metadata, 0);
|
||||||
|
av_dict_free(&metadata);
|
||||||
|
av_opt_set_dict_val(s, "metadata", NULL, AV_OPT_SEARCH_CHILDREN);
|
||||||
|
}
|
||||||
|
|
||||||
if (s->debug & FF_FDEBUG_TS)
|
if (s->debug & FF_FDEBUG_TS)
|
||||||
av_log(s, AV_LOG_DEBUG,
|
av_log(s, AV_LOG_DEBUG,
|
||||||
"read_frame_internal stream=%d, pts=%s, dts=%s, "
|
"read_frame_internal stream=%d, pts=%s, dts=%s, "
|
||||||
|
|
Loading…
Reference in New Issue