On 05/12/2011 01:56 AM, Anton Khirnov wrote:
> From: Aurelien Jacobs <au...@gnuage.org>
>
> Signed-off-by: Aurelien Jacobs <au...@gnuage.org>
> Signed-off-by: Anton Khirnov <an...@khirnov.net>
> ---
> libavformat/matroskadec.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index b75d22f..d65917c 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -1085,19 +1085,21 @@ static void matroska_convert_tags(AVFormatContext *s)
> if (tags[i].target.attachuid) {
> MatroskaAttachement *attachment = matroska->attachments.elem;
> for (j=0; j<matroska->attachments.nb_elem; j++)
> - if (attachment[j].uid == tags[i].target.attachuid)
> + if (attachment[j].uid == tags[i].target.attachuid
> + && attachment[j].stream)
> matroska_convert_tag(s, &tags[i].tag,
> &attachment[j].stream->metadata,
> NULL);
> } else if (tags[i].target.chapteruid) {
> MatroskaChapter *chapter = matroska->chapters.elem;
> for (j=0; j<matroska->chapters.nb_elem; j++)
> - if (chapter[j].uid == tags[i].target.chapteruid)
> + if (chapter[j].uid == tags[i].target.chapteruid
> + && chapter[j].chapter)
> matroska_convert_tag(s, &tags[i].tag,
> &chapter[j].chapter->metadata,
> NULL);
> } else if (tags[i].target.trackuid) {
> MatroskaTrack *track = matroska->tracks.elem;
> for (j=0; j<matroska->tracks.nb_elem; j++)
> - if (track[j].uid == tags[i].target.trackuid)
> + if (track[j].uid == tags[i].target.trackuid &&
> track[j].stream)
> matroska_convert_tag(s, &tags[i].tag,
> &track[j].stream->metadata, NULL);
> } else {
looks ok.
-Justin
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
