diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-06-19 08:28:07 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-06-19 08:28:07 +0000 |
| commit | 4bbe788ab7d1348d09026ef0c8554595fad5721d (patch) | |
| tree | e4042aa0a8aaad25b76b11c36bef21f896fdeb81 | |
| parent | 97668ac7f384ea436cec69331cd91bbaad27bd33 (diff) | |
Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder
should use it, too).
Originally committed as revision 19221 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/APIchanges | 5 | ||||
| -rw-r--r-- | ffmpeg.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index d012139f85..f92a89e500 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -12,6 +12,11 @@ libavutil: 2009-03-08 API changes, most recent first: +2009-06-19 - r19222 - lavc 52.32.0 - AVSubtitle.pts + Added a pts field to AVSubtitle which gives the subtitle's packet + PTS in AV_TIME_BASE. Some subtitle de-/encoders (e.g. XSUB) will + not work right without this. + 2009-06-03 - r19078 - lavc 52.30.2 - AV_PKT_FLAG_KEY PKT_FLAG_KEY has been deprecated and will be dropped for the next major version. Use AV_PKT_FLAG_KEY instead. @@ -814,6 +814,7 @@ static void do_subtitle_out(AVFormatContext *s, nb = 1; for(i = 0; i < nb; i++) { + sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q); subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, subtitle_out_max_size, sub); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7f26711f60..1786b138b0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 31 -#define LIBAVCODEC_VERSION_MICRO 2 +#define LIBAVCODEC_VERSION_MINOR 32 +#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -2734,6 +2734,7 @@ typedef struct AVSubtitle { uint32_t end_display_time; /* relative to packet pts, in ms */ unsigned num_rects; AVSubtitleRect **rects; + int64_t pts; ///< Same as packet pts, in AV_TIME_BASE } AVSubtitle; /* packet functions */ |