From d35cdd57194a7d30658739e36962d564d0d3f0db Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Tue, 23 Nov 2010 12:03:23 +0000 Subject: avidec: trivial simplification regarding av_metadata_set Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avidec.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libavformat/avidec.c') diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 9657779ac5..1094d62b5b 100644 --- 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) -- cgit v1.2.3