From ecfbcd68d868a617792dfe4f2917f5473fc6432c Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 15 Nov 2014 16:07:33 +0800
Subject: [PATCH] refine srslibrtmp, rename flv_bool to srs_flv_bool

---
 trunk/src/libs/srs_librtmp.cpp | 6 +++---
 trunk/src/libs/srs_librtmp.hpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp
index 76296121c..64ba3aa8b 100644
--- a/trunk/src/libs/srs_librtmp.cpp
+++ b/trunk/src/libs/srs_librtmp.cpp
@@ -767,17 +767,17 @@ void srs_flv_lseek(srs_flv_t flv, int64_t offset)
     context->reader.lseek(offset);
 }
 
-flv_bool srs_flv_is_eof(int error_code)
+srs_flv_bool srs_flv_is_eof(int error_code)
 {
     return error_code == ERROR_SYSTEM_FILE_EOF;
 }
 
-flv_bool srs_flv_is_sequence_header(char* data, int32_t size)
+srs_flv_bool srs_flv_is_sequence_header(char* data, int32_t size)
 {
     return SrsFlvCodec::video_is_sequence_header(data, (int)size);
 }
 
-flv_bool srs_flv_is_keyframe(char* data, int32_t size)
+srs_flv_bool srs_flv_is_keyframe(char* data, int32_t size)
 {
     return SrsFlvCodec::video_is_keyframe(data, (int)size);
 }
diff --git a/trunk/src/libs/srs_librtmp.hpp b/trunk/src/libs/srs_librtmp.hpp
index 65c1eb756..e0d6fb9df 100644
--- a/trunk/src/libs/srs_librtmp.hpp
+++ b/trunk/src/libs/srs_librtmp.hpp
@@ -269,7 +269,7 @@ extern const char* srs_format_time();
 **************************************************************
 *************************************************************/
 typedef void* srs_flv_t;
-typedef int flv_bool;
+typedef int srs_flv_bool;
 /* open flv file for both read/write. */
 extern srs_flv_t srs_flv_open_read(const char* file);
 extern srs_flv_t srs_flv_open_write(const char* file);
@@ -344,20 +344,20 @@ extern int64_t srs_flv_tellg(srs_flv_t flv);
 extern void srs_flv_lseek(srs_flv_t flv, int64_t offset);
 /* error code */
 /* whether the error code indicates EOF */
-extern flv_bool srs_flv_is_eof(int error_code);
+extern srs_flv_bool srs_flv_is_eof(int error_code);
 /* media codec */
 /**
 * whether the video body is sequence header 
 * @param data, the data of tag, read by srs_flv_read_tag_data().
 * @param size, the size of tag, read by srs_flv_read_tag_data().
 */
-extern flv_bool srs_flv_is_sequence_header(char* data, int32_t size);
+extern srs_flv_bool srs_flv_is_sequence_header(char* data, int32_t size);
 /**
 * whether the video body is keyframe 
 * @param data, the data of tag, read by srs_flv_read_tag_data().
 * @param size, the size of tag, read by srs_flv_read_tag_data().
 */
-extern flv_bool srs_flv_is_keyframe(char* data, int32_t size);
+extern srs_flv_bool srs_flv_is_keyframe(char* data, int32_t size);
 
 /*************************************************************
 **************************************************************