avidec: trivial simplification regarding av_metadata_set

Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk

avidec: trivial simplification regarding av_metadata_set
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
d35cdd57 · Aurelien Jacobs · eaa4542b · d35cdd57
Commit d35cdd57 authored Nov 23, 2010 by Aurelien Jacobs
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

avidec.c libavformat/avidec.c +2 -6

No files found.
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -266,12 +266,8 @@ static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag, uint32_t

    AV_WL32(key, tag);

-    if(st)
-        return av_metadata_set2(&st->metadata, key, value,
-                                    AV_METADATA_DONT_STRDUP_VAL);
-    else
-    return av_metadata_set2(&s->metadata, key, value,
-                                  AV_METADATA_DONT_STRDUP_VAL);
+    return av_metadata_set2(st ? &st->metadata : &s->metadata, key, value,
+                            AV_METADATA_DONT_STRDUP_VAL);
 }

 static void avi_read_info(AVFormatContext *s, uint64_t end)