From 0249478756091ab62f2d68f4d25f6b095f6723d8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 5 Aug 2011 13:15:04 +0200 Subject: [PATCH] doxygen: fix wrong comment syntax, //< vs. ///< --- avconv.c | 6 +++--- ffmpeg.c | 6 +++--- libavcodec/aac.h | 10 +++++----- libavcodec/aacps.c | 8 ++++---- libavcodec/aacps.h | 8 ++++---- libavcodec/aacps_tablegen.h | 2 +- libavcodec/avcodec.h | 4 ++-- libavcodec/mpeg4audio.h | 4 ++-- libavcodec/mpegvideo.h | 2 +- libavcodec/snow.c | 2 +- libavcodec/truespeech.c | 14 +++++++------- libavcodec/vp3.c | 2 +- libavfilter/vf_drawbox.c | 2 +- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/avconv.c b/avconv.c index 57721f8fb2..64b2347bf5 100644 --- a/avconv.c +++ b/avconv.c @@ -90,9 +90,9 @@ typedef struct StreamMap { * select an input file for an output file */ typedef struct MetadataMap { - int file; //< file index - char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram - int index; //< stream/chapter/program number + int file; ///< file index + char type; ///< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram + int index; ///< stream/chapter/program number } MetadataMap; static const OptionDef options[]; diff --git a/ffmpeg.c b/ffmpeg.c index c4ac3f9f62..f2e5bae8b2 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -89,9 +89,9 @@ typedef struct StreamMap { * select an input file for an output file */ typedef struct MetadataMap { - int file; //< file index - char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram - int index; //< stream/chapter/program number + int file; ///< file index + char type; ///< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram + int index; ///< stream/chapter/program number } MetadataMap; typedef struct ChapterMap { diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 4861ec0320..0653f810fd 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -104,11 +104,11 @@ enum CouplingPoint { * Output configuration status */ enum OCStatus { - OC_NONE, //< Output unconfigured - OC_TRIAL_PCE, //< Output configuration under trial specified by an inband PCE - OC_TRIAL_FRAME, //< Output configuration under trial specified by a frame header - OC_GLOBAL_HDR, //< Output configuration set in a global header but not yet locked - OC_LOCKED, //< Output configuration locked in place + OC_NONE, ///< Output unconfigured + OC_TRIAL_PCE, ///< Output configuration under trial specified by an inband PCE + OC_TRIAL_FRAME, ///< Output configuration under trial specified by a frame header + OC_GLOBAL_HDR, ///< Output configuration set in a global header but not yet locked + OC_LOCKED, ///< Output configuration locked in place }; /** diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c index 93bdd91dea..d7d6ef88d8 100644 --- a/libavcodec/aacps.c +++ b/libavcodec/aacps.c @@ -28,9 +28,9 @@ #include "aacps_tablegen.h" #include "aacpsdata.c" -#define PS_BASELINE 0 //< Operate in Baseline PS mode - //< Baseline implies 10 or 20 stereo bands, - //< mixing mode A, and no ipd/opd +#define PS_BASELINE 0 ///< Operate in Baseline PS mode + ///< Baseline implies 10 or 20 stereo bands, + ///< mixing mode A, and no ipd/opd #define numQMFSlots 32 //numTimeSlots * RATE @@ -654,7 +654,7 @@ static void decorrelation(PSContext *ps, float (*out)[32][2], const float (*s)[3 const int8_t *k_to_i = is34 ? k_to_i_34 : k_to_i_20; const float peak_decay_factor = 0.76592833836465f; const float transient_impact = 1.5f; - const float a_smooth = 0.25f; //< Smoothing coefficient + const float a_smooth = 0.25f; ///< Smoothing coefficient int i, k, m, n; int n0 = 0, nL = 32; static const int link_delay[] = { 3, 4, 5 }; diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h index 59a9bff4bc..124fbee221 100644 --- a/libavcodec/aacps.h +++ b/libavcodec/aacps.h @@ -52,11 +52,11 @@ typedef struct { int num_env; int enable_ipdopd; int border_position[PS_MAX_NUM_ENV+1]; - int8_t iid_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //thread_count) int picture_range_start, picture_range_end; ///< the part of picture that this context can allocate in - uint8_t *visualization_buffer[3]; //< temporary buffer vor MV visualization + uint8_t *visualization_buffer[3]; ///< temporary buffer vor MV visualization int last_dc[3]; ///< last DC values for MPEG1 int16_t *dc_val_base; int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous diff --git a/libavcodec/snow.c b/libavcodec/snow.c index b87d8285f6..2af5d234d7 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -3306,7 +3306,7 @@ static void update_last_header_values(SnowContext *s){ static int qscale2qlog(int qscale){ return rint(QROOT*log(qscale / (float)FF_QP2LAMBDA)/log(2)) - + 61*QROOT/8; //<64 >60 + + 61*QROOT/8; ///< 64 > 60 } static int ratecontrol_1pass(SnowContext *s, AVFrame *pict) diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index f8897754eb..6b6d13142f 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -33,13 +33,13 @@ */ typedef struct { /* input data */ - int16_t vector[8]; //< input vector: 5/5/4/4/4/3/3/3 - int offset1[2]; //< 8-bit value, used in one copying offset - int offset2[4]; //< 7-bit value, encodes offsets for copying and for two-point filter - int pulseoff[4]; //< 4-bit offset of pulse values block - int pulsepos[4]; //< 27-bit variable, encodes 7 pulse positions - int pulseval[4]; //< 7x2-bit pulse values - int flag; //< 1-bit flag, shows how to choose filters + int16_t vector[8]; ///< input vector: 5/5/4/4/4/3/3/3 + int offset1[2]; ///< 8-bit value, used in one copying offset + int offset2[4]; ///< 7-bit value, encodes offsets for copying and for two-point filter + int pulseoff[4]; ///< 4-bit offset of pulse values block + int pulsepos[4]; ///< 27-bit variable, encodes 7 pulse positions + int pulseval[4]; ///< 7x2-bit pulse values + int flag; ///< 1-bit flag, shows how to choose filters /* temporary data */ int filtbuf[146]; // some big vector used for storing filters int prevfilt[8]; // filter from previous frame diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 13a3bda4a5..462a482f42 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -225,7 +225,7 @@ typedef struct Vp3DecodeContext { /* these arrays need to be on 16-byte boundaries since SSE2 operations * index into them */ - DECLARE_ALIGNED(16, int16_t, qmat)[3][2][3][64]; //