Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder

Browse source 
should use it, too).

Originally committed as revision 19221 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-06-19 08:28:07 +00:00
parent 97668ac7f3
commit 4bbe788ab7
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/APIchanges
View file

@ -12,6 +12,11 @@ libavutil: 2009-03-08
API changes, most recent first: 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 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 PKT_FLAG_KEY has been deprecated and will be dropped for the next
major version. Use AV_PKT_FLAG_KEY instead. major version. Use AV_PKT_FLAG_KEY instead.

1
ffmpeg.c
View file

@ -814,6 +814,7 @@ static void do_subtitle_out(AVFormatContext *s,
nb = 1; nb = 1;
for(i = 0; i < nb; i++) { 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_size = avcodec_encode_subtitle(enc, subtitle_out,
subtitle_out_max_size, sub); subtitle_out_max_size, sub);

5
libavcodec/avcodec.h
View file

@ -30,8 +30,8 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 31 #define LIBAVCODEC_VERSION_MINOR 32
#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
@ -2734,6 +2734,7 @@ typedef struct AVSubtitle {
uint32_t end_display_time; /* relative to packet pts, in ms */ uint32_t end_display_time; /* relative to packet pts, in ms */
unsigned num_rects; unsigned num_rects;
AVSubtitleRect **rects; AVSubtitleRect **rects;
int64_t pts; ///< Same as packet pts, in AV_TIME_BASE
} AVSubtitle; } AVSubtitle;
/* packet functions */ /* packet functions */