summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-02-26 13:11:18 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-02-26 13:11:18 +0000
commit2904fd398f26f0a2db99dcec54cd009826344c61 (patch)
tree1f3fee087c83840f59ee069632d6df707aa2d1c5 /libavformat/movenc.c
parentb97fb809b8f0b2bd4ba5ab93e3f9e2540092ff79 (diff)
return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index ad27850305..0a37eb4fcb 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1651,6 +1651,8 @@ static int mov_write_header(AVFormatContext *s)
track->enc = st->codec;
track->language = ff_mov_iso639_to_lang(lang?lang->value:"und", mov->mode!=MODE_MOV);
+ if (track->language < 0)
+ track->language = 0;
track->mode = mov->mode;
track->tag = mov_find_codec_tag(s, track);
if (!track->tag) {