[FFmpeg-cvslog] r19221 - in trunk: doc/APIchanges ffmpeg.c libavcodec/avcodec.h

[reimar]

Author: reimar
Date: Fri Jun 19 10:28:07 2009
New Revision: 19221

Log:
Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder
should use it, too).

Modified:
   trunk/doc/APIchanges
   trunk/ffmpeg.c
   trunk/libavcodec/avcodec.h

Modified: trunk/doc/APIchanges
==============================================================================
--- trunk/doc/APIchanges	Fri Jun 19 01:44:05 2009	(r19220)
+++ trunk/doc/APIchanges	Fri Jun 19 10:28:07 2009	(r19221)
@@ -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.

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Fri Jun 19 01:44:05 2009	(r19220)
+++ trunk/ffmpeg.c	Fri Jun 19 10:28:07 2009	(r19221)
@@ -814,6 +814,7 @@ static void do_subtitle_out(AVFormatCont
         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);
 

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Fri Jun 19 01:44:05 2009	(r19220)
+++ trunk/libavcodec/avcodec.h	Fri Jun 19 10:28:07 2009	(r19221)
@@ -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 */