[FFmpeg-cvslog] r25814 - trunk/libavformat/avidec.c

[aurel]

Author: aurel
Date: Tue Nov 23 13:03:23 2010
New Revision: 25814

Log:
avidec: trivial simplification regarding av_metadata_set

Modified:
   trunk/libavformat/avidec.c

Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c	Tue Nov 23 09:24:41 2010	(r25813)
+++ trunk/libavformat/avidec.c	Tue Nov 23 13:03:23 2010	(r25814)
@@ -266,12 +266,8 @@ static int avi_read_tag(AVFormatContext 
 
     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)