From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 16 Sep 2014 16:28:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'cehoyos/master'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a07b0ffdc3424b729238d3cbd0673af9095a90f6;hp=7c3ba1b83aebab68366e1fb333133a8e2a338019;p=ffmpeg

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a closing LF to Webm-manifest files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c
index 96820ae4283..0f620689059 100644
--- a/tools/crypto_bench.c
+++ b/tools/crypto_bench.c
@@ -33,6 +33,10 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/timer.h"
 
+#ifndef AV_READ_TIME
+#define AV_READ_TIME(x) 0
+#endif
+
 #if HAVE_UNISTD_H
 #include <unistd.h> /* for getopt */
 #endif