[SCM] libav/experimental: mpeg4video: Fix doxygen comment syntax to document correct struct member

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Aug 30 15:49:51 UTC 2014


The following commit has been merged in the experimental branch:
commit 93f29948e4b06acfb96e7f82d373ef86d6dc55f7
Author: Nidhi Makhijani <nidhimj22 at gmail.com>
Date:   Tue Aug 12 17:58:17 2014 +0530

    mpeg4video: Fix doxygen comment syntax to document correct struct member
    
    Also fix some comment typos.
    
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index b092684..22d6d59 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -62,29 +62,29 @@
 typedef struct Mpeg4DecContext {
     MpegEncContext m;
 
-    ///< number of bits to represent the fractional part of time
+    /// number of bits to represent the fractional part of time
     int time_increment_bits;
     int shape;
     int vol_sprite_usage;
     int sprite_brightness_change;
     int num_sprite_warping_points;
-    ///< sprite trajectory points
+    /// sprite trajectory points
     uint16_t sprite_traj[4][2];
-    ///< sprite shift [isChroma]
+    /// sprite shift [isChroma]
     int sprite_shift[2];
 
     // reversible vlc
     int rvlc;
-    ///< could this stream contain resync markers
+    /// could this stream contain resync markers
     int resync_marker;
-    ///< time distance of first I -> B, used for interlaced b frames
+    /// time distance of first I -> B, used for interlaced B-frames
     int t_frame;
 
     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
+    /// QP above which the ac VLC should be used for intra dc
     int intra_dc_threshold;
 
     /* bug workarounds */
@@ -92,11 +92,11 @@ typedef struct Mpeg4DecContext {
     int divx_build;
     int xvid_build;
     int lavc_build;
-    ///< flag for having shown the warning about divxs invalid b frames
+    /// flag for having shown the warning about invalid Divx B-frames
     int showed_packed_warning;
-    int vol_control_parameters; /**< does the stream contain the low_delay flag,
-                                 *   used to work around buggy encoders. */
-
+    /** does the stream contain the low_delay flag,
+     *  used to work around buggy encoders. */
+    int vol_control_parameters;
     int cplx_estimation_trash_i;
     int cplx_estimation_trash_p;
     int cplx_estimation_trash_b;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list