summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-30 01:09:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-30 19:19:22 +0200
commitba3e3311ef3f8b33a975535988d2305cea15d514 (patch)
tree27c113b309e9fd4ed542766f5fbfbd7687bb6539 /libavutil
parent6f622e5fcbe8484af194436b8dd4ff01f092ab99 (diff)
downloadffmpeg-ba3e3311ef3f8b33a975535988d2305cea15d514.tar.gz
avutil/frame: add av_frame_side_data_name()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/frame.c14
-rw-r--r--libavutil/frame.h5
-rw-r--r--libavutil/version.h2
3 files changed, 20 insertions, 1 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c
index fdfbc46753..2c62922db9 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -672,3 +672,17 @@ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type)
}
}
}
+
+const char *av_frame_side_data_name(enum AVFrameSideDataType type)
+{
+ switch(type) {
+ case AV_FRAME_DATA_PANSCAN: return "AVPanScan";
+ case AV_FRAME_DATA_A53_CC: return "ATSC A53 Part 4 Closed Captions";
+ case AV_FRAME_DATA_STEREO3D: return "Stereoscopic 3d metadata";
+ case AV_FRAME_DATA_MATRIXENCODING: return "AVMatrixEncoding";
+ case AV_FRAME_DATA_DOWNMIX_INFO: return "Metadata relevant to a downmix procedure";
+ case AV_FRAME_DATA_REPLAYGAIN: return "AVReplayGain";
+ case AV_FRAME_DATA_DISPLAYMATRIX: return "3x3 displaymatrix";
+ }
+ return NULL;
+}
diff --git a/libavutil/frame.h b/libavutil/frame.h
index a39c8d07ff..c57eb552e2 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -728,6 +728,11 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
/**
+ * @return a string identifying the side data type
+ */
+const char *av_frame_side_data_name(enum AVFrameSideDataType type);
+
+/**
* @}
*/
diff --git a/libavutil/version.h b/libavutil/version.h
index 0c69a7893b..42e2db51d4 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -56,7 +56,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 93
+#define LIBAVUTIL_VERSION_MINOR 94
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \