summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorIvan Schreter <schreter@gmx.net>2009-02-19 23:35:59 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-02-19 23:35:59 +0000
commitb1fa4942056e8f09b5d19d913f7353245875b7a9 (patch)
tree9c421af62cc1f9f44b08d10fac08dff6f59c3d9b /libavformat
parente9259f8d183c9b4d413acccdc8705acba6a656cb (diff)
Add convergence_duration to AVCodecParserContext.
Patch by Ivan Schreter, schreter gmx net Originally committed as revision 17468 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h2
-rw-r--r--libavformat/utils.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 561e367a31..2427f84077 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -23,7 +23,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 29
-#define LIBAVFORMAT_VERSION_MICRO 1
+#define LIBAVFORMAT_VERSION_MICRO 2
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2d66dced35..6fcca6ffbf 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -909,6 +909,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE)
pkt->flags |= PKT_FLAG_KEY;
}
+ if (pc)
+ pkt->convergence_duration = pc->convergence_duration;
}
void av_destruct_packet_nofree(AVPacket *pkt)