summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2017-09-07 22:27:09 +0100
committerMark Thompson <sw@jkqxz.net>2017-09-13 22:25:29 +0100
commit82342cead15bbc47b84be4c0b50e7fd7401cdb96 (patch)
tree164426bc51e1f371668c6a83eacce6e1c8124243
parent170c65335caad782db6e474f4a0c55911803e8d7 (diff)
lavc: Add flag to mark packets containing trusted input
-rw-r--r--doc/APIchanges3
-rw-r--r--libavcodec/avcodec.h7
-rw-r--r--libavcodec/version.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index c37de06138..c20ab9c988 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first:
+2017-09-13 - xxxxxxx - lavc 57.106.100 - avcodec.h
+ Add AV_PKT_FLAG_TRUSTED.
+
2017-09-13 - xxxxxxx - lavu 55.75.100 - hwcontext.h hwcontext_drm.h
Add AV_HWDEVICE_TYPE_DRM and implementation.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7708bb2adb..fdf93f9a54 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1709,6 +1709,13 @@ typedef struct AVPacket {
* after decoding.
**/
#define AV_PKT_FLAG_DISCARD 0x0004
+/**
+ * The packet comes from a trusted source.
+ *
+ * Otherwise-unsafe constructs such as arbitrary pointers to data
+ * outside the packet may be followed.
+ */
+#define AV_PKT_FLAG_TRUSTED 0x0008
enum AVSideDataParamChangeFlags {
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 55b8ddc13c..2aff092cf4 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 105
+#define LIBAVCODEC_VERSION_MINOR 106
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \