---
libavcodec/mpeg4video.h | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 59358eb..9f0d00e 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -29,7 +29,7 @@
#include "mpegvideo.h"
#include "rl.h"
-// shapes
+/* shapes */
#define RECT_SHAPE 0
#define BIN_SHAPE 1
#define BIN_ONLY_SHAPE 2
@@ -43,11 +43,9 @@
#define ACE_VO_TYPE 12
#define ADV_SIMPLE_VO_TYPE 17
-// aspect_ratio_info
-#define EXTENDED_PAR 15
+#define EXTENDED_PAR 15 ///< aspect_ratio_info
-//vol_sprite_usage / sprite_enable
-#define STATIC_SPRITE 1
+#define STATIC_SPRITE 1 ///< vol_sprite_usage / sprite_enable
#define GMC_SPRITE 2
#define MOTION_MARKER 0x1F001
@@ -62,38 +60,31 @@
typedef struct Mpeg4DecContext {
MpegEncContext m;
- ///< number of bits to represent the fractional part of time
- int time_increment_bits;
+ int time_increment_bits; ///< number of bits to represent the fractional
part of time
int shape;
int vol_sprite_usage;
int sprite_brightness_change;
int num_sprite_warping_points;
- ///< sprite trajectory points
- uint16_t sprite_traj[4][2];
- ///< sprite shift [isChroma]
- int sprite_shift[2];
-
- // reversible vlc
- int rvlc;
- ///< could this stream contain resync markers
- int resync_marker;
- ///< time distance of first I -> B, used for interlaced b frames
- int t_frame;
+ uint16_t sprite_traj[4][2]; ///< sprite trajectory points
+ int sprite_shift[2]; ///< sprite shift [isChroma]
+
+ int rvlc; ///< reversible vlc
+ int resync_marker; ///< could this stream contain resync markers
+ int t_frame; ///< time distance of first I -> B, used for interlaced b
frames
int new_pred;
int enhancement_type;
int scalability;
int use_intra_dc_vlc;
- ///< QP above whch the ac VLC should be used for intra dc
- int intra_dc_threshold;
+ int intra_dc_threshold; ///< QP above whch the ac VLC should be used
for intra dc
/* bug workarounds */
int divx_version;
int divx_build;
int xvid_build;
int lavc_build;
- ///< flag for having shown the warning about divxs invalid b frames
- int showed_packed_warning;
+ int showed_packed_warning; ///< flag for having shown the warning about
divxs invalid b frames
+
int cplx_estimation_trash_i;
int cplx_estimation_trash_p;
--
1.9.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
