---
ffmpeg.c | 6 +++---
libavcodec/aac.h | 10 +++++-----
libavcodec/aacps.c | 8 ++++----
libavcodec/aacps.h | 8 ++++----
libavcodec/avcodec.h | 4 ++--
libavcodec/mpeg4audio.h | 4 ++--
libavcodec/mpegvideo.h | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 1749581..09fd4f4 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 4861ec0..0653f81 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 93bdd91..d7d6ef8 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 59a9bff..124fbee 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]; //<Inter-channel
Intensity Difference Parameters
- int8_t icc_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-Channel
Coherence Parameters
+ int8_t iid_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-channel
Intensity Difference Parameters
+ int8_t icc_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-Channel
Coherence Parameters
/* ipd/opd is iid/icc sized so that the same functions can handle both */
- int8_t ipd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-channel Phase
Difference Parameters
- int8_t opd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Overall Phase
Difference Parameters
+ int8_t ipd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-channel Phase
Difference Parameters
+ int8_t opd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Overall Phase
Difference Parameters
int is34bands;
int is34bands_old;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 74a60ae..d2df719 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2830,8 +2830,8 @@ typedef struct AVCodecContext {
* - decoding: Set by user, otherwise the default is used.
*/
int thread_type;
-#define FF_THREAD_FRAME 1 //< Decode more than one frame at once
-#define FF_THREAD_SLICE 2 //< Decode more than one part of a single frame at
once
+#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once
+#define FF_THREAD_SLICE 2 ///< Decode more than one part of a single frame
at once
/**
* Which multithreading methods are in use by the codec.
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 2d2b4a2..c729c04 100644
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -31,13 +31,13 @@ typedef struct {
int sampling_index;
int sample_rate;
int chan_config;
- int sbr; //< -1 implicit, 1 presence
+ int sbr; ///< -1 implicit, 1 presence
int ext_object_type;
int ext_sampling_index;
int ext_sample_rate;
int ext_chan_config;
int channels;
- int ps; //< -1 implicit, 1 presence
+ int ps; ///< -1 implicit, 1 presence
} MPEG4AudioConfig;
extern const int ff_mpeg4audio_sample_rates[16];
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 00293db..47c8e8a 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -298,7 +298,7 @@ typedef struct MpegEncContext {
Picture *current_picture_ptr; ///< pointer to the current picture
int picture_count; ///< number of allocated pictures
(MAX_PICTURE_COUNT * avctx->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
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
