virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'

Browse Source 
* commit '93c04e095dc37ebdab22174e88cfa91e24940866':
  Expose metadata found in onCuePoint events in .flv files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-13 23:14:17 +02:00
parent f01a1281ee 93c04e095d
commit 9f97f7c546
1 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/flvdec.c
View File

@@ -458,8 +458,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
return -1; return -1;
} }
// only look for metadata values when we are not nested and key != NULL if (key) {
if (depth == 1 && key) { // stream info doesn't live any deeper than the first object
if (depth == 1) {
acodec = astream ? astream->codec : NULL; acodec = astream ? astream->codec : NULL;
vcodec = vstream ? vstream->codec : NULL; vcodec = vstream ? vstream->codec : NULL;
@@ -500,6 +501,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
} }
} }
} }
}
if (amf_type == AMF_DATA_TYPE_OBJECT && s->nb_streams == 1 && if (amf_type == AMF_DATA_TYPE_OBJECT && s->nb_streams == 1 &&
((!acodec && !strcmp(key, "audiocodecid")) || ((!acodec && !strcmp(key, "audiocodecid")) ||
@@ -560,7 +562,7 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
if (!strcmp(buffer, "onTextData")) if (!strcmp(buffer, "onTextData"))
return 1; return 1;
if (strcmp(buffer, "onMetaData")) if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint"))
return -1; return -1;
// find the streams now so that amf_parse_object doesn't need to do // find the streams now so that amf_parse_object doesn't need to do