[SCM] libav/experimental: Replace some fixed width variable from AVSubtitle* by normal int.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:34:34 UTC 2013
The following commit has been merged in the experimental branch:
commit ebc466bb5fdbfef71700d5f56ffb3cb10e8a3868
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Jan 3 18:41:35 2009 +0000
Replace some fixed width variable from AVSubtitle* by normal int.
Originally committed as revision 16415 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3269561..bda66bb 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2394,11 +2394,11 @@ enum AVSubtitleType {
};
typedef struct AVSubtitleRect {
- uint16_t x; ///< top left corner of pict, undefined when pict is not set
- uint16_t y; ///< top left corner of pict, undefined when pict is not set
- uint16_t w; ///< width of pict, undefined when pict is not set
- uint16_t h; ///< height of pict, undefined when pict is not set
- uint16_t nb_colors; ///< number of colors in pict, undefined when pict is not set
+ int x; ///< top left corner of pict, undefined when pict is not set
+ int y; ///< top left corner of pict, undefined when pict is not set
+ int w; ///< width of pict, undefined when pict is not set
+ int h; ///< height of pict, undefined when pict is not set
+ int nb_colors; ///< number of colors in pict, undefined when pict is not set
int linesize;
uint32_t *rgba_palette;
uint8_t *bitmap;
@@ -2408,7 +2408,7 @@ typedef struct AVSubtitle {
uint16_t format; /* 0 = graphics */
uint32_t start_display_time; /* relative to packet pts, in ms */
uint32_t end_display_time; /* relative to packet pts, in ms */
- uint32_t num_rects;
+ unsigned num_rects;
AVSubtitleRect **rects;
} AVSubtitle;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list