diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 17:40:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 17:51:09 +0200 |
| commit | 042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18 (patch) | |
| tree | fe6d6db2945987a5c10923fb28515361eea6eab2 /libavcodec | |
| parent | e6cc30c22bb2007e4d66302d6477176ecf0c0877 (diff) | |
| parent | e3bc07f4af25287fa4ade1e9c5501de65c8a698e (diff) | |
| download | ffmpeg-042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
44 files changed, 146 insertions, 107 deletions
diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 5d94e005a2..3864d61857 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -22,6 +22,8 @@ /** * @file * 8svx audio decoder + * @author Jaikrishnan Menon + * * supports: fibonacci delta encoding * : exponential encoding * diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index e7dff757b8..61536971d1 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -32,8 +32,8 @@ #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED #include "ac3enc_opts_template.c" -static AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name, - ac3fixed_options, LIBAVUTIL_VERSION_INT }; +static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name, + ac3fixed_options, LIBAVUTIL_VERSION_INT }; #include "ac3enc_template.c" diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 83337530f2..fa19a210b0 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -35,8 +35,8 @@ #if CONFIG_AC3_ENCODER #define AC3ENC_TYPE AC3ENC_TYPE_AC3 #include "ac3enc_opts_template.c" -static AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name, - ac3_options, LIBAVUTIL_VERSION_INT }; +static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name, + ac3_options, LIBAVUTIL_VERSION_INT }; #endif #include "ac3enc_template.c" diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 96c15fffc9..4957cc2518 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -23,9 +23,7 @@ * @file * ALAC (Apple Lossless Audio Codec) decoder * @author 2005 David Hammerton - * - * For more information on the ALAC format, visit: - * http://crazney.net/programs/itunes/alac.html + * @see http://crazney.net/programs/itunes/alac.html * * Note: This decoder expects a 36- (0x24-)byte QuickTime atom to be * passed through the extradata[_size] fields. This atom is tacked onto diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 3869b87aa2..fa2db05765 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -23,8 +23,8 @@ * @file * @brief Bethesda Softworks VID Video Decoder * @author Nicholas Tung [ntung (at. ntung com] (2007-03) - * @sa http://wiki.multimedia.cx/index.php?title=Bethsoft_VID - * @sa http://www.svatopluk.com/andux/docs/dfvid.html + * @see http://wiki.multimedia.cx/index.php?title=Bethsoft_VID + * @see http://www.svatopluk.com/andux/docs/dfvid.html */ #include "libavutil/common.h" diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 9e40b86e50..1f31d7fb61 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -23,7 +23,7 @@ * @file * @brief Brute Force & Ignorance (.bfi) video decoder * @author Sisir Koppaka ( sisir.koppaka at gmail dot com ) - * @sa http://wiki.multimedia.cx/index.php?title=BFI + * @see http://wiki.multimedia.cx/index.php?title=BFI */ #include "libavutil/common.h" diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index aae7bbbb1b..c774ce2c3e 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -26,8 +26,8 @@ * @file * @brief CD Graphics Video Decoder * @author Michael Tison - * @sa http://wiki.multimedia.cx/index.php?title=CD_Graphics - * @sa http://www.ccs.neu.edu/home/bchafy/cdb/info/cdg + * @see http://wiki.multimedia.cx/index.php?title=CD_Graphics + * @see http://www.ccs.neu.edu/home/bchafy/cdb/info/cdg */ /// default screen sizes diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index f39b9f1925..0433db49d7 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -31,8 +31,8 @@ #define AC3ENC_TYPE AC3ENC_TYPE_EAC3 #include "ac3enc_opts_template.c" -static AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name, - eac3_options, LIBAVUTIL_VERSION_INT }; +static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name, + eac3_options, LIBAVUTIL_VERSION_INT }; void ff_eac3_set_cpl_states(AC3EncodeContext *s) diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 44792f0483..bb028a17fc 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -22,10 +22,8 @@ /** * @file * Electronic Arts TQI Video Decoder - * by Peter Ross <pross@xvid.org> - * - * Technical details here: - * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TQI + * @author Peter Ross <pross@xvid.org> + * @see http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TQI */ #include "avcodec.h" diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 34aa576660..c157b984d3 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -20,8 +20,8 @@ */ /** - * CCITT Fax Group 3 and 4 decompression * @file + * CCITT Fax Group 3 and 4 decompression * @author Konstantin Shishkov */ #include "avcodec.h" diff --git a/libavcodec/faxcompr.h b/libavcodec/faxcompr.h index 62f591ceee..53d11681b2 100644 --- a/libavcodec/faxcompr.h +++ b/libavcodec/faxcompr.h @@ -20,8 +20,8 @@ */ /** - * CCITT Fax Group 3 and 4 decompression * @file + * CCITT Fax Group 3 and 4 decompression * @author Konstantin Shishkov */ #ifndef AVCODEC_FAXCOMPR_H diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index ece095cf09..d45be6cb35 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -23,9 +23,7 @@ * @file * FLAC (Free Lossless Audio Codec) decoder * @author Alex Beregszaszi - * - * For more information on the FLAC format, visit: - * http://flac.sourceforge.net/ + * @see http://flac.sourceforge.net/ * * This decoder can be used in 1 of 2 ways: Either raw FLAC data can be fed * through, starting from the initial 'fLaC' signature; or by passing the diff --git a/libavcodec/g722.c b/libavcodec/g722.c index f00fa6a0e2..30c6f5313c 100644 --- a/libavcodec/g722.c +++ b/libavcodec/g722.c @@ -26,7 +26,6 @@ /** * @file - * * G.722 ADPCM audio codec * * This G.722 decoder is a bit-exact implementation of the ITU G.722 diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index 853fa64a48..7b33bdd7f3 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -1,6 +1,4 @@ -/** - * @file - * huffman tree builder and VLC generator +/* * Copyright (c) 2006 Konstantin Shishkov * * This file is part of FFmpeg. @@ -20,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * huffman tree builder and VLC generator + */ + #include "avcodec.h" #include "get_bits.h" #include "huffman.h" diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 3c08e6fb1b..5e0787a5e8 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -1,6 +1,4 @@ -/** - * @file - * huffman tree builder and VLC generator +/* * Copyright (C) 2007 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -20,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * huffman tree builder and VLC generator + */ + #ifndef AVCODEC_HUFFMAN_H #define AVCODEC_HUFFMAN_H diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c index aa886910be..185a05d6ab 100644 --- a/libavcodec/lzw.c +++ b/libavcodec/lzw.c @@ -24,7 +24,7 @@ * @file * @brief LZW decoding routines * @author Fabrice Bellard - * Modified for use in TIFF by Konstantin Shishkov + * @author modified for use in TIFF by Konstantin Shishkov */ #include "avcodec.h" diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h index 76a5b6752e..115ca4edb4 100644 --- a/libavcodec/lzw.h +++ b/libavcodec/lzw.h @@ -24,7 +24,7 @@ * @file * @brief LZW decoding routines * @author Fabrice Bellard - * Modified for use in TIFF by Konstantin Shishkov + * @author modified for use in TIFF by Konstantin Shishkov */ #ifndef AVCODEC_LZW_H diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c index 23248a6034..0757d02ab4 100644 --- a/libavcodec/lzwenc.c +++ b/libavcodec/lzwenc.c @@ -20,8 +20,8 @@ */ /** - * LZW encoder * @file + * LZW encoder * @author Bartlomiej Wolowiec */ diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index d8e3727a40..c9d42b48e8 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/** - * @file - */ - #ifndef AVCODEC_MSMPEG4_H #define AVCODEC_MSMPEG4_H diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index bf7cebbbe2..9d4421f3b2 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -20,10 +20,10 @@ */ /** - * PCX image encoder * @file + * PCX image encoder * @author Daniel Verkamp - * @sa http://www.qzx.com/pc-gpe/pcx.txt + * @see http://www.qzx.com/pc-gpe/pcx.txt */ #include "avcodec.h" diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 6eb836456c..7a1f3e1021 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -26,6 +26,7 @@ * @file * QDM2 decoder * @author Ewald Snel, Benjamin Larsson, Alex Beregszaszi, Roberto Togni + * * The decoder is not perfect yet, there are still some distortions * especially on files encoded with 16 or 8 subbands. */ diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index 8a553539ab..f58e4ae8be 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -20,11 +20,10 @@ */ /** - * RL2 Video Decoder * @file + * RL2 Video Decoder * @author Sascha Sommer (saschasommer@freenet.de) - * For more information about the RL2 format, visit: - * http://wiki.multimedia.cx/index.php?title=RL2 + * @see http://wiki.multimedia.cx/index.php?title=RL2 */ #include <stdio.h> diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index c54eaee346..f371dc60c3 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -21,7 +21,9 @@ /** * @file * TIFF image decoder + * @author Konstantin Shishkov */ + #include "avcodec.h" #if CONFIG_ZLIB #include <zlib.h> diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index e1aca68e35..d5fad42771 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -18,17 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_TIFF_H -#define AVCODEC_TIFF_H - /** * @file * TIFF tables * * For more information about the TIFF format, check the official docs at: * http://partners.adobe.com/public/developer/tiff/index.html + * @author Konstantin Shishkov */ +#ifndef AVCODEC_TIFF_H +#define AVCODEC_TIFF_H + #include <stdint.h> /** abridged list of TIFF tags */ diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index f7228f128f..48b3d3f769 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -20,10 +20,11 @@ */ /** - * TIFF image encoder * @file + * TIFF image encoder * @author Bartlomiej Wolowiec */ + #include "avcodec.h" #if CONFIG_ZLIB #include <zlib.h> diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index b1083fe682..424cddf84d 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -20,10 +20,10 @@ */ /** - * 8088flex TMV video decoder * @file + * 8088flex TMV video decoder * @author Daniel Verkamp - * @sa http://www.oldskool.org/pc/8088_Corruption + * @see http://www.oldskool.org/pc/8088_Corruption */ #include "avcodec.h" diff --git a/libavcodec/tta.c b/libavcodec/tta.c index dccca46132..b644cdee5f 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -22,9 +22,9 @@ /** * @file * TTA (The Lossless True Audio) decoder - * (www.true-audio.com or tta.corecodec.org) + * @see http://www.true-audio.com/ + * @see http://tta.corecodec.org/ * @author Alex Beregszaszi - * */ #define ALT_BITSTREAM_READER_LE diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 9b3655a9c6..718e180942 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -23,9 +23,10 @@ #include "vaapi_internal.h" #include "h264.h" -/** @file - * This file implements the glue code between FFmpeg's and VA API's - * structures for H.264 decoding. +/** + * @file + * This file implements the glue code between FFmpeg's and VA API's + * structures for H.264 decoding. */ /** diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index fc830293cc..1624948626 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -20,6 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * Common code for Vorbis I encoder and decoder + * @author Denes Balatoni ( dbalatoni programozo hu ) + */ + #define ALT_BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 024c8fd3cf..2d91ca1317 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -20,6 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * Vorbis I decoder + * @author Denes Balatoni ( dbalatoni programozo hu ) + */ + #include <inttypes.h> #include <math.h> diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index e9de38e6dd..fc17e4386c 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -1,7 +1,4 @@ -/** - * @file - * VP5 compatible video decoder - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP5 compatible video decoder + */ + #include <stdlib.h> #include <string.h> diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index ad451c251f..0c6f45a767 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -1,7 +1,4 @@ -/** - * @file - * VP5 and VP6 compatible video decoder (common features) - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP5 and VP6 compatible video decoder (common features) + */ + #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index d1735e5609..b982435156 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -1,7 +1,4 @@ -/** - * @file - * VP5 and VP6 compatible video decoder (common features) - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP5 and VP6 compatible video decoder (common features) + */ + #ifndef AVCODEC_VP56_H #define AVCODEC_VP56_H diff --git a/libavcodec/vp56data.c b/libavcodec/vp56data.c index b0515c2410..a161f885d9 100644 --- a/libavcodec/vp56data.c +++ b/libavcodec/vp56data.c @@ -1,7 +1,4 @@ -/** - * @file - * VP5 and VP6 compatible video decoder (common data) - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP5 and VP6 compatible video decoder (common data) + */ + #include "vp56data.h" const uint8_t vp56_b2p[] = { 0, 0, 0, 0, 1, 2, 3, 3, 3, 3 }; diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index 57b0968d89..cb9cf95998 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -1,7 +1,4 @@ -/** - * @file - * VP5 and VP6 compatible video decoder (common data) - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP5 and VP6 compatible video decoder (common data) + */ + #ifndef AVCODEC_VP56DATA_H #define AVCODEC_VP56DATA_H diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h index 5c2d46cde5..e16ff2da4b 100644 --- a/libavcodec/vp5data.h +++ b/libavcodec/vp5data.h @@ -1,7 +1,4 @@ -/** - * @file - * VP5 compatible video decoder - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP5 compatible video decoder + */ + #ifndef AVCODEC_VP5DATA_H #define AVCODEC_VP5DATA_H diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 0a02ce58d6..9f350a942d 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -1,13 +1,6 @@ -/** - * @file - * VP6 compatible video decoder - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * - * The VP6F decoder accepts an optional 1 byte extradata. It is composed of: - * - upper 4bits: difference between encoded width and visible width - * - lower 4bits: difference between encoded height and visible height - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -25,6 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP6 compatible video decoder + * + * The VP6F decoder accepts an optional 1 byte extradata. It is composed of: + * - upper 4 bits: difference between encoded width and visible width + * - lower 4 bits: difference between encoded height and visible height + */ + #include <stdlib.h> #include "avcodec.h" diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h index 1cfdbe7bea..3ebfd0e252 100644 --- a/libavcodec/vp6data.h +++ b/libavcodec/vp6data.h @@ -1,7 +1,4 @@ -/** - * @file - * VP6 compatible video decoder - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP6 compatible video decoder + */ + #ifndef AVCODEC_VP6DATA_H #define AVCODEC_VP6DATA_H diff --git a/libavcodec/vp6dsp.c b/libavcodec/vp6dsp.c index 1119b56705..67c6be07de 100644 --- a/libavcodec/vp6dsp.c +++ b/libavcodec/vp6dsp.c @@ -1,7 +1,4 @@ -/** - * @file - * VP6 DSP-oriented functions - * +/* * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP6 DSP-oriented functions + */ + #include "libavutil/common.h" #include "vp56dsp.h" diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 9ff21a1a97..0ea24d7ed8 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -1,6 +1,4 @@ -/** - * VP8 compatible video decoder - * +/* * Copyright (C) 2010 David Conrad * Copyright (C) 2010 Ronald S. Bultje * @@ -21,6 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP8 compatible video decoder + */ + #ifndef AVCODEC_VP8DATA_H #define AVCODEC_VP8DATA_H diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 4391a7ebc7..ce90675d87 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -1,6 +1,4 @@ -/** - * VP8 compatible video decoder - * +/* * Copyright (C) 2010 David Conrad * Copyright (C) 2010 Ronald S. Bultje * @@ -21,6 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP8 compatible video decoder + */ + #include "dsputil.h" #include "vp8dsp.h" diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h index e8757ab7d0..987fa59a72 100644 --- a/libavcodec/vp8dsp.h +++ b/libavcodec/vp8dsp.h @@ -1,6 +1,4 @@ -/** - * VP8 compatible video decoder - * +/* * Copyright (C) 2010 David Conrad * Copyright (C) 2010 Ronald S. Bultje * @@ -21,6 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * VP8 compatible video decoder + */ #ifndef AVCODEC_VP8DSP_H #define AVCODEC_VP8DSP_H diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index ca4fd94d75..91ae687d06 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -21,9 +21,9 @@ /** * @file - * VQA Video Decoder by Mike Melanson (melanson@pcisys.net) - * For more information about the VQA format, visit: - * http://wiki.multimedia.cx/index.php?title=VQA + * VQA Video Decoder + * @author Mike Melanson (melanson@pcisys.net) + * @see http://wiki.multimedia.cx/index.php?title=VQA * * The VQA video decoder outputs PAL8 or RGB555 colorspace data, depending * on the type of data in the file. diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 45a3344b9e..dbd0217ce5 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -1,5 +1,4 @@ -/** - * @file +/* * Psygnosis YOP decoder * * Copyright (C) 2010 Mohamed Naufal Basheer <naufal11@gmail.com> |