summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2011-02-14 18:43:38 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-02-15 16:32:31 +0100
commit2ea7e1f011438ee180c6260c74fe3894327a21f2 (patch)
tree2819d9ef16e80d0bf849817d63884cb55930181f /libavformat
parente24c05cd537a2d160ca008391cc7746c5bf7e025 (diff)
lavf: add AV_DISPOSITION_CLEAN_EFFECTS flag
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 24a83bd10a1ed56cadd2c475b839887752f23183)
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h1
-rw-r--r--libavformat/utils.c2
-rw-r--r--libavformat/version.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index ff72361e1b..cc56fb7840 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -474,6 +474,7 @@ typedef struct AVIndexEntry {
#define AV_DISPOSITION_FORCED 0x0040
#define AV_DISPOSITION_HEARING_IMPAIRED 0x0080 /**< stream for hearing impaired audiences */
#define AV_DISPOSITION_VISUAL_IMPAIRED 0x0100 /**< stream for visual impaired audiences */
+#define AV_DISPOSITION_CLEAN_EFFECTS 0x0200 /**< stream without voice */
/**
* Stream structure.
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3cae6c6844..6abfdcdc75 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3255,6 +3255,8 @@ static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_out
av_log(NULL, AV_LOG_INFO, " (hearing impaired)");
if (st->disposition & AV_DISPOSITION_VISUAL_IMPAIRED)
av_log(NULL, AV_LOG_INFO, " (visual impaired)");
+ if (st->disposition & AV_DISPOSITION_CLEAN_EFFECTS)
+ av_log(NULL, AV_LOG_INFO, " (clean effects)");
av_log(NULL, AV_LOG_INFO, "\n");
dump_metadata(NULL, st->metadata, " ");
}
diff --git a/libavformat/version.h b/libavformat/version.h
index d13ec07799..4e26eaaebc 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -24,7 +24,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 99
+#define LIBAVFORMAT_VERSION_MINOR 100
#define LIBAVFORMAT_VERSION_MICRO 1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \