Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 16:28:32 +0000 (18:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 16:28:37 +0000 (18:28 +0200)
* cehoyos/master:
  Add a closing LF to Webm-manifest files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tools/crypto_bench.c

index 96820ae4283f3e554279790f834190cf3198f6f3..0f6206890590e7520bbfd3a109251a4ad0179b5d 100644 (file)
 #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