aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-21 15:24:59 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-21 15:26:20 +0200
commitc01f1157acbec4274a38a728cf7fa9731ef23d82 (patch)
tree72d4fd691fdab418e75e05963b4e2a7e86fb7539 /libavformat
parent82439dec0fbf8a31159327ddf57096a0013109b9 (diff)
parent0f40c9098498ad90dbbd2380eb4269015e84bde4 (diff)
downloadffmpeg-c01f1157acbec4274a38a728cf7fa9731ef23d82.tar.gz
Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4': Drop pointless assert.h #includes Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asfdec_o.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c
index 1c564a8339..64be1b6e99 100644
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.c
@@ -20,7 +20,6 @@
*/
#include "libavutil/attributes.h"
-#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/bswap.h"
#include "libavutil/common.h"