OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaa4542
)
avidec: trivial simplification regarding av_metadata_set
author
Aurelien Jacobs
<aurel@gnuage.org>
Tue, 23 Nov 2010 12:03:23 +0000
(12:03 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Tue, 23 Nov 2010 12:03:23 +0000
(12:03 +0000)
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
9657779
..
1094d62
100644
(file)
--- 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)