diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:06:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:07:06 +0200 |
| commit | 233ab0f02a316e3f7d515089d5d5dbc4a895ac11 (patch) | |
| tree | 6874651ee5743be3187c9cf5a9275c517083aa41 | |
| parent | 642207d29a4861900cf34f19e8c7ded23ace6075 (diff) | |
| parent | 5bcd3ae5b167fb74215520b01d5d810e0c8986ab (diff) | |
| download | ffmpeg-233ab0f02a316e3f7d515089d5d5dbc4a895ac11.tar.gz | |
Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'
* commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab':
matroskadec: Check that .lang was allocated and set before reading it
Conflicts:
libavformat/matroskadec.c
See: 01fd1aa0ad2b95045df35f94ee9de073d24609c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 60f7a5a87c..f1e466dd52 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1270,7 +1270,8 @@ static void matroska_convert_tag(AVFormatContext *s, EbmlList *list, int i; for (i=0; i < list->nb_elem; i++) { - const char *lang= (tags[i].lang && strcmp(tags[i].lang, "und")) ? tags[i].lang : NULL; + const char *lang = tags[i].lang && strcmp(tags[i].lang, "und") ? + tags[i].lang : NULL; if (!tags[i].name) { av_log(s, AV_LOG_WARNING, "Skipping invalid tag with no TagName.\n"); |