diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-11-23 12:03:23 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-11-23 12:03:23 +0000 |
| commit | d35cdd57194a7d30658739e36962d564d0d3f0db (patch) | |
| tree | 7e7e671e75650ae39dc65eac0ca9c1fac7c63c3f /libavformat/avidec.c | |
| parent | eaa4542b64daeba4881c8893bb90f7a579222f13 (diff) | |
| download | ffmpeg-d35cdd57194a7d30658739e36962d564d0d3f0db.tar.gz | |
avidec: trivial simplification regarding av_metadata_set
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 8 |
1 files changed, 2 insertions, 6 deletions
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) |