aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/avutil.h
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-08-13 18:26:01 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-08-14 01:56:28 +0200
commit323b930699179cb17b39fddaa9aba3379c0c9e26 (patch)
tree4f5be7de15f1dadc4c838ae4434ea77dbe5eb233 /libavutil/avutil.h
parenta9d1878abe81ae8085d12590c5d089a49a0714e7 (diff)
downloadffmpeg-323b930699179cb17b39fddaa9aba3379c0c9e26.tar.gz
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
The new function provides a more flexible interface for peeking at a FIFO buffer data.
Diffstat (limited to 'libavutil/avutil.h')
-rw-r--r--libavutil/avutil.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index ffcac1c152..fc437dd21f 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,8 +40,8 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 11
-#define LIBAVUTIL_VERSION_MICRO 1
+#define LIBAVUTIL_VERSION_MINOR 12
+#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
@@ -66,6 +66,9 @@
#ifndef FF_API_FIND_OPT
#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 52)
#endif
+#ifndef FF_API_AV_FIFO_PEEK
+#define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
/**
* Return the LIBAVUTIL_VERSION_INT constant.