har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2011-07-15 17:40:51 +02:00
commit 042f9d62ca
65 changed files with 198 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -2536,7 +2536,14 @@ case $target_os in
symbian)
SLIBSUF=".dll"
enable dos_paths
add_cflags --include=$sysinclude/gcce/gcce.h
add_cflags --include=$sysinclude/gcce/gcce.h -fvisibility=default
add_cppflags -D__GCCE__ -D__SYMBIAN32__ -DSYMBIAN_OE_POSIX_SIGNALS
add_ldflags -Wl,--target1-abs,--no-undefined \
-Wl,-Ttext,0x80000,-Tdata,0x1000000 -shared \
-Wl,--entry=_E32Startup -Wl,-u,_E32Startup
add_extralibs -l:eexe.lib -l:usrt2_2.lib -l:dfpaeabi.dso \
-l:drtaeabi.dso -l:scppnwdl.dso -lsupc++ -lgcc \
-l:libc.dso -l:libm.dso -l:euser.dso -l:libcrt0.lib
;;
none)
;;

2
doc/developer.texi
View File

@ -85,7 +85,7 @@ above them explaining what the function does, even if it is just one sentence.
All structures and their member variables should be documented, too.
@example
/**
* @@file mpeg.c
* @@file
* MPEG codec.
* @@author ...
*/

2
ffmpeg.c
View File

@ -599,7 +599,7 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
av_log(NULL, AV_LOG_ERROR, "%s '%s' is experimental and might produce bad "
"results.\nAdd '-strict experimental' if you want to use it.\n",
codec_string, c->codec->name);
codec = encoder ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id);
codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n",
codec_string, codec->name);

16
ffserver.c
View File

@ -3644,18 +3644,6 @@ static void build_feed_streams(void)
FFStream *stream, *feed;
int i;
/* gather all streams */
for(stream = first_stream; stream != NULL; stream = stream->next) {
feed = stream->feed;
if (feed) {
if (!stream->is_feed) {
/* we handle a stream coming from a feed */
for(i=0;i<stream->nb_streams;i++)
stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
}
}
}
/* gather all streams */
for(stream = first_stream; stream != NULL; stream = stream->next) {
feed = stream->feed;
@ -3663,6 +3651,10 @@ static void build_feed_streams(void)
if (stream->is_feed) {
for(i=0;i<stream->nb_streams;i++)
stream->feed_streams[i] = i;
} else {
/* we handle a stream coming from a feed */
for(i=0;i<stream->nb_streams;i++)
stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
}
}
}

2
libavcodec/8svx.c
View File

@ -22,6 +22,8 @@
/**
* @file
* 8svx audio decoder
* @author Jaikrishnan Menon
*
* supports: fibonacci delta encoding
* : exponential encoding
*

2
libavcodec/ac3enc_fixed.c
View File

@ -32,7 +32,7 @@
#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,
static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
ac3fixed_options, LIBAVUTIL_VERSION_INT };
#include "ac3enc_template.c"

2
libavcodec/ac3enc_float.c
View File

@ -35,7 +35,7 @@
#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,
static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
ac3_options, LIBAVUTIL_VERSION_INT };
#endif

4
libavcodec/alac.c
View File

@ -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

4
libavcodec/bethsoftvideo.c
View File

@ -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"

2
libavcodec/bfi.c
View File

@ -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"

4
libavcodec/cdgraphics.c
View File

@ -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

2
libavcodec/eac3enc.c
View File

@ -31,7 +31,7 @@
#define AC3ENC_TYPE AC3ENC_TYPE_EAC3
#include "ac3enc_opts_template.c"
static AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
eac3_options, LIBAVUTIL_VERSION_INT };

6
libavcodec/eatqi.c
View File

@ -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"

2
libavcodec/faxcompr.c
View File

@ -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"

2
libavcodec/faxcompr.h
View File

@ -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

4
libavcodec/flacdec.c
View File

@ -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

1
libavcodec/g722.c
View File

@ -26,7 +26,6 @@
/**
* @file
*
* G.722 ADPCM audio codec
*
* This G.722 decoder is a bit-exact implementation of the ITU G.722

9
libavcodec/huffman.c
View File

@ -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"

9
libavcodec/huffman.h
View File

@ -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

2
libavcodec/lzw.c
View File

@ -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"

2
libavcodec/lzw.h
View File

@ -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

2
libavcodec/lzwenc.c
View File

@ -20,8 +20,8 @@
*/
/**
* LZW encoder
* @file
* LZW encoder
* @author Bartlomiej Wolowiec
*/

4
libavcodec/msmpeg4.h
View File

@ -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

4
libavcodec/pcxenc.c
View File

@ -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"

1
libavcodec/qdm2.c
View File

@ -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.
*/

5
libavcodec/rl2.c
View File

@ -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>

2
libavcodec/tiff.c
View File

@ -21,7 +21,9 @@
/**
* @file
* TIFF image decoder
* @author Konstantin Shishkov
*/
#include "avcodec.h"
#if CONFIG_ZLIB
#include <zlib.h>

7
libavcodec/tiff.h
View File

@ -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 */

3
libavcodec/tiffenc.c
View File

@ -20,10 +20,11 @@
*/
/**
* TIFF image encoder
* @file
* TIFF image encoder
* @author Bartlomiej Wolowiec
*/
#include "avcodec.h"
#if CONFIG_ZLIB
#include <zlib.h>

4
libavcodec/tmv.c
View File

@ -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"

4
libavcodec/tta.c
View File

@ -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

3
libavcodec/vaapi_h264.c
View File

@ -23,7 +23,8 @@
#include "vaapi_internal.h"
#include "h264.h"
/** @file
/**
* @file
* This file implements the glue code between FFmpeg's and VA API's
* structures for H.264 decoding.
*/

6
libavcodec/vorbis.c
View File

@ -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"

6
libavcodec/vorbisdec.c
View File

@ -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>

10
libavcodec/vp5.c
View File

@ -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>

10
libavcodec/vp56.c
View File

@ -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"

10
libavcodec/vp56.h
View File

@ -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

10
libavcodec/vp56data.c
View File

@ -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 };

10
libavcodec/vp56data.h
View File

@ -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

10
libavcodec/vp5data.h
View File

@ -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

18
libavcodec/vp6.c
View File

@ -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"

10
libavcodec/vp6data.h
View File

@ -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

10
libavcodec/vp6dsp.c
View File

@ -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"

9
libavcodec/vp8data.h
View File

@ -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

9
libavcodec/vp8dsp.c
View File

@ -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"

8
libavcodec/vp8dsp.h
View File

@ -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

6
libavcodec/vqavideo.c
View File

@ -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.

3
libavcodec/yop.c
View File

@ -1,5 +1,4 @@
/**
* @file
/*
* Psygnosis YOP decoder
*
* Copyright (C) 2010 Mohamed Naufal Basheer <naufal11@gmail.com>

2
libavdevice/fbdev.c
View File

@ -24,7 +24,7 @@
* @file
* Linux framebuffer input device,
* inspired by code from fbgrab.c by Gunnar Monell.
* See also http://linux-fbdev.sourceforge.net/.
* @see http://linux-fbdev.sourceforge.net/
*/
/* #define DEBUG */

4
libavformat/bethsoftvid.c
View File

@ -23,8 +23,8 @@
* @file
* @brief Bethesda Softworks VID (.vid) file demuxer
* @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/intreadwrite.h"

2
libavformat/bfi.c
View File

@ -23,7 +23,7 @@
* @file
* @brief Brute Force & Ignorance (.bfi) file demuxer
* @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/intreadwrite.h"

8
libavformat/flv.h
View File

@ -1,5 +1,4 @@
/**
* @file
/*
* FLV common header
*
* Copyright (c) 2006 The FFmpeg Project
@ -21,6 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* FLV common header
*/
#ifndef AVFORMAT_FLV_H
#define AVFORMAT_FLV_H

3
libavformat/iss.c
View File

@ -23,8 +23,7 @@
* @file
* Funcom ISS file demuxer
* @author Jaikrishnan Menon
* for more information on the .iss file format, visit:
* http://wiki.multimedia.cx/index.php?title=FunCom_ISS
* @see http://wiki.multimedia.cx/index.php?title=FunCom_ISS
*/
#include "avformat.h"

2
libavformat/qcp.c
View File

@ -23,7 +23,7 @@
* @file
* QCP format (.qcp) demuxer
* @author Kenan Gillet
* @sa RFC 3625: "The QCP File Format and Media Types for Speech Data"
* @see RFC 3625: "The QCP File Format and Media Types for Speech Data"
* http://tools.ietf.org/html/rfc3625
*/

3
libavformat/rl2.c
View File

@ -23,8 +23,7 @@
* RL2 file demuxer
* @file
* @author Sascha Sommer (saschasommer@freenet.de)
* For more information regarding the RL2 file format, visit:
* http://wiki.multimedia.cx/index.php?title=RL2
* @see http://wiki.multimedia.cx/index.php?title=RL2
*
* extradata:
* 2 byte le initial drawing offset within 320x200 viewport

2
libavformat/rtpdec_svq3.c
View File

@ -22,8 +22,8 @@
/**
* @file
* @brief RTP support for the SV3V (SVQ3) payload
* (http://wiki.multimedia.cx/index.php?title=Sorenson_Video_3#Packetization)
* @author Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* @see http://wiki.multimedia.cx/index.php?title=Sorenson_Video_3#Packetization
*/
#include <string.h>

2
libavformat/rtpdec_vp8.c
View File

@ -23,7 +23,7 @@
* @file
* @brief RTP support for the VP8 payload
* @author Josh Allmann <joshua.allmann@gmail.com>
* ( http://www.webmproject.org/code/specs/rtp/ )
* @see http://www.webmproject.org/code/specs/rtp/
*/
#include "libavcodec/bytestream.h"

4
libavformat/soxdec.c
View File

@ -23,10 +23,10 @@
*/
/**
* SoX native format demuxer
* @file
* SoX native format demuxer
* @author Daniel Verkamp
* @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
* @see http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
*/
#include "libavutil/intreadwrite.h"

4
libavformat/soxenc.c
View File

@ -23,10 +23,10 @@
*/
/**
* SoX native format muxer
* @file
* SoX native format muxer
* @author Daniel Verkamp
* @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
* @see http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
*/
#include "libavutil/intreadwrite.h"

4
libavformat/tmv.c
View File

@ -20,10 +20,10 @@
*/
/**
* 8088flex TMV file demuxer
* @file
* 8088flex TMV file demuxer
* @author Daniel Verkamp
* @sa http://www.oldskool.org/pc/8088_Corruption
* @see http://www.oldskool.org/pc/8088_Corruption
*/
#include "libavutil/intreadwrite.h"

2
libavformat/utils.c
View File

@ -619,7 +619,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
{
AVFormatContext *s = *ps;
int ret = 0;
AVFormatParameters ap = { 0 };
AVFormatParameters ap = { { 0 } };
AVDictionary *tmp = NULL;
if (!s && !(s = avformat_alloc_context()))

3
libavformat/yop.c
View File

@ -1,5 +1,4 @@
/**
* @file
/*
* Psygnosis YOP demuxer
*
* Copyright (C) 2010 Mohamed Naufal Basheer <naufal11@gmail.com>

4
libavutil/mem.h
View File

@ -76,10 +76,10 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
* Allocate or reallocate a block of memory.
* If ptr is NULL and size > 0, allocate a new block. If
* size is zero, free the memory block pointed to by ptr.
* @param size Size in bytes for the memory block to be allocated or
* reallocated.
* @param ptr Pointer to a memory block already allocated with
* av_malloc(z)() or av_realloc() or NULL.
* @param size Size in bytes for the memory block to be allocated or
* reallocated.
* @return Pointer to a newly reallocated block or NULL if the block
* cannot be reallocated or the function is used to free the memory block.
* @see av_fast_realloc()

10
libavutil/timer.h
View File

@ -1,7 +1,4 @@
/**
* @file
* high precision timer, useful to profile code
*
/*
* copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
*
* This file is part of FFmpeg.
@ -21,6 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* high precision timer, useful to profile code
*/
#ifndef AVUTIL_TIMER_H
#define AVUTIL_TIMER_H

13
libswscale/utils.c
View File

@ -1048,19 +1048,20 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
//Note we need at least one pixel more at the end because of the MMX code (just in case someone wanna replace the 4000/8000)
/* align at 16 bytes for AltiVec */
for (i=0; i<c->vLumBufSize; i++) {
FF_ALLOCZ_OR_GOTO(c, c->lumPixBuf[i+c->vLumBufSize], dst_stride+1, fail);
FF_ALLOCZ_OR_GOTO(c, c->lumPixBuf[i+c->vLumBufSize], dst_stride+16, fail);
c->lumPixBuf[i] = c->lumPixBuf[i+c->vLumBufSize];
}
c->uv_off = dst_stride>>1;
c->uv_offx2 = dst_stride;
// 64 / c->scalingBpp is the same as 16 / sizeof(scaling_intermediate)
c->uv_off = (dst_stride>>1) + 64 / c->scalingBpp;
c->uv_offx2 = dst_stride + 16;
for (i=0; i<c->vChrBufSize; i++) {
FF_ALLOC_OR_GOTO(c, c->chrUPixBuf[i+c->vChrBufSize], dst_stride*2+1, fail);
FF_ALLOC_OR_GOTO(c, c->chrUPixBuf[i+c->vChrBufSize], dst_stride*2+32, fail);
c->chrUPixBuf[i] = c->chrUPixBuf[i+c->vChrBufSize];
c->chrVPixBuf[i] = c->chrVPixBuf[i+c->vChrBufSize] = c->chrUPixBuf[i] + (dst_stride >> 1);
c->chrVPixBuf[i] = c->chrVPixBuf[i+c->vChrBufSize] = c->chrUPixBuf[i] + (dst_stride >> 1) + 8;
}
if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf)
for (i=0; i<c->vLumBufSize; i++) {
FF_ALLOCZ_OR_GOTO(c, c->alpPixBuf[i+c->vLumBufSize], dst_stride+1, fail);
FF_ALLOCZ_OR_GOTO(c, c->alpPixBuf[i+c->vLumBufSize], dst_stride+16, fail);
c->alpPixBuf[i] = c->alpPixBuf[i+c->vLumBufSize];
}