Merge changes I62702bdb,Ice6d06c5,I60204c62,Ib9fdf65e

[libvpx] / ivfdec.h

diff --git a/ivfdec.h b/ivfdec.h
index b1468a9f329d862253a00829830a3dcf00770520..847cd79f3fef64dfa0072152c9f54aaa0fc06889 100644 (file)
--- a/ivfdec.h
+++ b/ivfdec.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef IVFDEC_H_
-#define IVFDEC_H_
+#ifndef VPX_IVFDEC_H_
+#define VPX_IVFDEC_H_
 
 #include "./tools_common.h"
 
@@ -18,13 +18,11 @@ extern "C" {
 
 int file_is_ivf(struct VpxInputContext *input);
 
-int ivf_read_frame(struct VpxInputContext *input,
-                   uint8_t **buffer,
-                   size_t *bytes_read,
+int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
                    size_t *buffer_size);
 
 #ifdef __cplusplus
-}  /* extern "C" */
+} /* extern "C" */
 #endif
 
-#endif  /* IVFDEC_H_ */
+#endif  // VPX_IVFDEC_H_