| commit | 9c38070a4c117122600dc5a605bcc1a159d0ea90 | |
| author | Filip Roséen <filip@videolabs.io> | |
| Tue, 17 May 2016 18:18:49 +0000 (17 20:18 +0200) | ||
| committer | Jean-Baptiste Kempf <jb@videolan.org> | |
| Tue, 24 May 2016 22:08:42 +0000 (25 00:08 +0200) | ||
| tree | 326f2e8bc56c042b17da4752d0ee8ba7300061be | treesnapshot (tar.gz zip) |
| parent | 3189e48dc85390d471519dd93322e7f1a98540ab | commitdiff |
Xiph metadata: fix bug causing redudant "extra" metadata
The IF_EXTRACT_FMT macro is to be used in a if-else-tree, the usage of
IF_EXTRACT prior to the following if-statement did however cause the
single if-else-tree to be split up into two (causing the fallback-else
at the end to be unconditionally hit, even if another branch had already
handled the data).
If "TITLE=" metadata was found, we would still end up inside the
fallback since the previous implementation of IF_EXTRACT_FMT would start
a new if-else-tree.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
The IF_EXTRACT_FMT macro is to be used in a if-else-tree, the usage of
IF_EXTRACT prior to the following if-statement did however cause the
single if-else-tree to be split up into two (causing the fallback-else
at the end to be unconditionally hit, even if another branch had already
handled the data).
If "TITLE=" metadata was found, we would still end up inside the
fallback since the previous implementation of IF_EXTRACT_FMT would start
a new if-else-tree.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
| modules/demux/xiph_metadata.c | diffblobblamehistory |