[FFmpeg-cvslog] Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'

James Almer git at videolan.org
Tue Mar 21 22:05:28 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 21 17:04:44 2017 -0300| [de36e98a16f495d051e301653115ebf99a7d7929] | committer: James Almer

Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'

* commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f':
  avio: cosmetics, prettify AVIO_SEEKABLE_NORMAL

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de36e98a16f495d051e301653115ebf99a7d7929
---

 libavformat/avio.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 8040094..cec7fd7 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -34,7 +34,10 @@
 
 #include "libavformat/version.h"
 
-#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
+/**
+ * Seeking works like for a local file.
+ */
+#define AVIO_SEEKABLE_NORMAL (1 << 0)
 
 /**
  * Callback for checking whether to abort blocking functions.


======================================================================




More information about the ffmpeg-cvslog mailing list