I'm all for consistency, so I'm in favor of this patch, thank you.
On date Thursday 2011-06-23 22:41:54 +0200, Diego Biurrun encoded:
> ---
> libavcodec/acelp_pitch_delay.h | 74
> +++++++++++++++++++-------------------
> libavcodec/avcodec.h | 6 ++--
> libavcodec/celp_filters.h | 2 +-
> libavcodec/fft.h | 2 +-
> libavcodec/g729dec.c | 2 +-
> libavcodec/h264_parser.c | 2 +-
> libavcodec/lagarith.c | 26 +++++++-------
> libavcodec/lagarithrac.h | 14 ++++----
> libavcodec/lcldec.c | 14 ++++----
> libavcodec/lsp.c | 6 ++--
> libavcodec/lsp.h | 42 +++++++++++-----------
> libavcodec/motion_est.c | 2 +-
> libavcodec/motion_est_template.c | 8 ++--
> libavcodec/mpegvideo.h | 2 +-
> libavcodec/nuv.c | 14 ++++----
> libavcodec/qcelpdata.h | 6 ++--
> libavcodec/qcelpdec.c | 8 ++--
> libavcodec/rtjpeg.c | 38 ++++++++++----------
> libavcodec/tableprint.h | 2 +-
> libavcodec/twinvq.c | 8 ++--
> libavcodec/vaapi.c | 2 +-
> libavcodec/vaapi.h | 4 +-
> libavcodec/vaapi_internal.h | 2 +-
> libavcodec/vdpau.c | 2 +-
> libavcodec/vdpau.h | 12 +++---
> libavcodec/x86/idct_sse2_xvid.c | 2 +-
> libavcodec/x86/idct_xvid.h | 2 +-
> libavcodec/xsubenc.c | 4 +-
> libavformat/asfcrypt.c | 36 +++++++++---------
> libavformat/gxf.c | 54 ++++++++++++++--------------
> libavformat/mpegts.c | 8 ++--
> libavformat/nuv.c | 10 +++---
> libavutil/common.h | 20 +++++-----
> libavutil/des.c | 2 +-
> libavutil/des.h | 18 +++++-----
> libavutil/lzo.c | 22 ++++++------
> libavutil/lzo.h | 22 ++++++------
> libavutil/rc4.h | 18 +++++-----
> 38 files changed, 259 insertions(+), 259 deletions(-)
[...]
> diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
> index 3d53536..1c18b96 100644
> --- a/libavcodec/lagarith.c
> +++ b/libavcodec/lagarith.c
> @@ -32,25 +32,25 @@
> #include "lagarithrac.h"
>
> enum LagarithFrameType {
> - FRAME_RAW = 1, /*!< uncompressed */
> - FRAME_U_RGB24 = 2, /*!< unaligned RGB24 */
> - FRAME_ARITH_YUY2 = 3, /*!< arithmetic coded YUY2 */
> - FRAME_ARITH_RGB24 = 4, /*!< arithmetic coded RGB24 */
> - FRAME_SOLID_GRAY = 5, /*!< solid grayscale color frame */
> - FRAME_SOLID_COLOR = 6, /*!< solid non-grayscale color frame */
> - FRAME_OLD_ARITH_RGB = 7, /*!< obsolete arithmetic coded RGB (no
> longer encoded by upstream since version 1.1.0) */
> - FRAME_ARITH_RGBA = 8, /*!< arithmetic coded RGBA */
> - FRAME_SOLID_RGBA = 9, /*!< solid RGBA color frame */
> - FRAME_ARITH_YV12 = 10, /*!< arithmetic coded YV12 */
> - FRAME_REDUCED_RES = 11, /*!< reduced resolution YV12 frame */
> + FRAME_RAW = 1, /**< uncompressed */
> + FRAME_U_RGB24 = 2, /**< unaligned RGB24 */
> + FRAME_ARITH_YUY2 = 3, /**< arithmetic coded YUY2 */
> + FRAME_ARITH_RGB24 = 4, /**< arithmetic coded RGB24 */
> + FRAME_SOLID_GRAY = 5, /**< solid grayscale color frame */
> + FRAME_SOLID_COLOR = 6, /**< solid non-grayscale color frame */
> + FRAME_OLD_ARITH_RGB = 7, /**< obsolete arithmetic coded RGB (no
> longer encoded by upstream since version 1.1.0) */
> + FRAME_ARITH_RGBA = 8, /**< arithmetic coded RGBA */
> + FRAME_SOLID_RGBA = 9, /**< solid RGBA color frame */
> + FRAME_ARITH_YV12 = 10, /**< arithmetic coded YV12 */
> + FRAME_REDUCED_RES = 11, /**< reduced resolution YV12 frame */
The "///<" syntax is more usual in the codebase, but this should be
equivalent so feel free to keep it.
> };
>
> typedef struct LagarithContext {
> AVCodecContext *avctx;
> AVFrame picture;
> DSPContext dsp;
> - int zeros; /*!< number of consecutive zero bytes
> encountered */
> - int zeros_rem; /*!< number of zero bytes remaining to
> output */
> + int zeros; /**< number of consecutive zero bytes
> encountered */
> + int zeros_rem; /**< number of zero bytes remaining to
> output */
> } LagarithContext;
>
> /**
> diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h
> index 6a8fa95..b942199 100644
> --- a/libavcodec/lagarithrac.h
> +++ b/libavcodec/lagarithrac.h
> @@ -40,15 +40,15 @@ typedef struct lag_rac {
> AVCodecContext *avctx;
> unsigned low;
> unsigned range;
> - unsigned scale; /*!< Number of bits of precision in range. */
> - unsigned hash_shift; /*!< Number of bits to shift to calculate
> hash for radix search. */
> + unsigned scale; /**< Number of bits of precision in range. */
> + unsigned hash_shift; /**< Number of bits to shift to calculate
> hash for radix search. */
>
> - const uint8_t *bytestream_start; /*!< Start of input bytestream. */
> - const uint8_t *bytestream; /*!< Current position in input
> bytestream. */
> - const uint8_t *bytestream_end; /*!< End position of input bytestream.
> */
> + const uint8_t *bytestream_start; /**< Start of input bytestream. */
> + const uint8_t *bytestream; /**< Current position in input
> bytestream. */
> + const uint8_t *bytestream_end; /**< End position of input bytestream.
> */
>
> - uint32_t prob[258]; /*!< Table of cumulative probability for
> each symbol. */
> - uint8_t range_hash[256]; /*!< Hash table mapping upper byte to
> approximate symbol. */
> + uint32_t prob[258]; /**< Table of cumulative probability for
> each symbol. */
> + uint8_t range_hash[256]; /**< Hash table mapping upper byte to
> approximate symbol. */
> } lag_rac;
ditto
[...]
Looks fine otherwise.
--
Just remember: when you go to court, you are trusting your fate to
twelve people that weren't smart enough to get out of jury duty!
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
