aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-21 14:31:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-22 14:59:02 +0200
commit696452e4c5d217ca784fcfc5397fd12cc7ff2bd6 (patch)
tree5212d613bf4f804c9d7a7f8656065aa48bc118b0
parent672f8226bbe37d3328731e7f5093e0b00c35ae54 (diff)
downloadffmpeg-696452e4c5d217ca784fcfc5397fd12cc7ff2bd6.tar.gz
avcodec: add parser flag to indicate that codec TS are the only available and should be used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/version.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e4d494b088..9dfb64b720 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3807,6 +3807,7 @@ typedef struct AVCodecParserContext {
#define PARSER_FLAG_ONCE 0x0002
/// Set if the parser has a valid file offset
#define PARSER_FLAG_FETCHED_OFFSET 0x0004
+#define PARSER_FLAG_USE_CODEC_TS 0x1000
int64_t offset; ///< byte offset from starting packet start
int64_t cur_frame_end[AV_PARSER_PTS_NB];
diff --git a/libavcodec/version.h b/libavcodec/version.h
index a9fa31ac48..d176818562 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,8 +27,8 @@
*/
#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 21
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MINOR 22
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \